diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs
index 8bf8131f57..9e1e11b79b 100644
--- a/app/assets/javascripts/admin/addon/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs
@@ -38,7 +38,7 @@
         {{#if this.model.email}}
           <a href="mailto:{{this.model.email}}">{{this.model.email}}</a>
         {{else}}
-          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
         {{/if}}
       </div>
       <div class="controls">
@@ -65,7 +65,7 @@
             {{i18n "user.email.no_secondary"}}
           {{/if}}
         {{else}}
-          <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+          <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
         {{/if}}
       </div>
 
@@ -99,7 +99,7 @@
         {{#if this.associatedAccountsLoaded}}
           {{this.associatedAccounts}}
         {{else}}
-          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
         {{/if}}
       </div>
     </div>
@@ -561,7 +561,7 @@
           {{#if this.ssoExternalEmail}}
             <div class="value">{{this.ssoExternalEmail}}</div>
           {{else}}
-            <DButton @class="btn-default" @action={{action "checkSsoEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+            <DButton @class="btn-default" @action={{action "checkSsoEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
           {{/if}}
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
index b9a83de3d8..df1149d8a5 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js
@@ -34,8 +34,8 @@ const REPLACEMENTS = {
   "notification.liked_2": "heart",
   "notification.liked_many": "heart",
   "notification.liked_consolidated": "heart",
-  "notification.private_message": "far-envelope",
-  "notification.invited_to_private_message": "far-envelope",
+  "notification.private_message": "envelope",
+  "notification.invited_to_private_message": "envelope",
   "notification.invited_to_topic": "hand-point-right",
   "notification.invitee_accepted": "user",
   "notification.moved_post": "sign-out-alt",
diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index 4caa7d2e7a..f4a2757cae 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -28,7 +28,7 @@
     {{#if @showPrivateMessages}}
       <li class="private-messages">
         <LinkTo @route="userPrivateMessages">
-          {{d-icon "far-envelope"}}
+          {{d-icon "envelope"}}
           <span>{{i18n "user.private_messages"}}</span>
         </LinkTo>
       </li>
diff --git a/app/assets/javascripts/discourse/app/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
index 568edf2169..444b373c40 100644
--- a/app/assets/javascripts/discourse/app/templates/about.hbs
+++ b/app/assets/javascripts/discourse/app/templates/about.hbs
@@ -120,7 +120,7 @@
 
       {{#if this.contactInfo}}
         <section class="about contact">
-          <h3>{{d-icon "far-envelope"}} {{i18n "about.contact"}}</h3>
+          <h3>{{d-icon "envelope"}} {{i18n "about.contact"}}</h3>
           <p>{{html-safe this.contactInfo}}</p>
         </section>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
index 2f9f51a47f..5df8c8dba4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
@@ -229,7 +229,7 @@
   {{#if this.emailInEnabled}}
     <section class="field category-email-in">
       <label for="category-email-in">
-        {{d-icon "far-envelope"}}
+        {{d-icon "envelope"}}
         {{i18n "category.email_in"}}
       </label>
       <TextField @id="category-email-in" @class="email-in" @value={{this.category.email_in}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
index 39b8e7dd3a..ff7e70e3af 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
@@ -7,7 +7,7 @@
   <ReviewableTags @tags={{this.reviewable.payload.tags}} @tagName="" />
   {{#if this.reviewable.payload.via_email}}
     <a href {{on "click" this.showRawEmail}} class="show-raw-email">
-      {{d-icon "far-envelope" title="post.via_email"}}
+      {{d-icon "envelope" title="post.via_email"}}
     </a>
   {{/if}}
 </ReviewableTopicLink>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
index eb3e459841..1adf14a961 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
@@ -9,7 +9,7 @@
 {{/if}}
 {{#each this.sortedTags as |tag|}}
   <div class="tag-box">
-    {{discourse-tag tag.id description=tag.description isPrivateMessage=this.isPrivateMessage pmOnly=tag.pmOnly tagsForUser=this.tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
+    {{discourse-tag tag.id description=tag.description isPrivateMessage=this.isPrivateMessage pmOnly=tag.pmOnly tagsForUser=this.tagsForUser}} {{#if tag.pmOnly}}{{d-icon "envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
   </div>
 {{/each}}
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index eb422a5e39..a2097db3ef 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -196,11 +196,11 @@
             {{/if}}
             {{#if this.showCheckEmail}}
               <h3 class="email">
-                {{d-icon "far-envelope" title="user.email.title"}}
+                {{d-icon "envelope" title="user.email.title"}}
                 {{#if this.user.email}}
                   {{this.user.email}}
                 {{else}}
-                  <DButton @action={{action "checkEmail"}} @actionParam={{this.user}} @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
+                  <DButton @action={{action "checkEmail"}} @actionParam={{this.user}} @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
                 {{/if}}
               </h3>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 6d7069c5f9..c8a33c91fd 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -83,7 +83,7 @@
       </div>
     {{else}}
       <div class="controls">
-        <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" />
+        <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="envelope" @label="admin.users.check_email.text" />
       </div>
     {{/if}}
   </div>
@@ -123,7 +123,7 @@
       </table>
     {{else}}
       <div class="controls">
-        <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" />
+        <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="envelope" @label="admin.users.check_email.text" />
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 553196e307..80b308b013 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -199,7 +199,7 @@
                   {{#if this.model.email}}
                     {{this.model.email}}
                   {{else}}
-                    <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
+                    <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
                   {{/if}}
                 </dd>
                 </div>
@@ -263,7 +263,7 @@
             {{/if}}
 
             {{#if this.showPrivateMessages}}
-              <li class="private-messages"><LinkTo @route="userPrivateMessages">{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}</LinkTo></li>
+              <li class="private-messages"><LinkTo @route="userPrivateMessages">{{d-icon "envelope"}}{{i18n 'user.private_messages'}}</LinkTo></li>
             {{/if}}
 
             {{#if this.canInviteToForum}}
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 201614eb63..4289530592 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -504,7 +504,7 @@
       }
     }
     .is-warning {
-      .d-icon-far-envelope {
+      .d-icon-envelope {
         color: var(--danger);
       }
     }
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
index 2967778664..35949d0b42 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
@@ -142,7 +142,7 @@
           <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd>
           <dt>{{i18n "user.email.title"}}</dt>
           <dd title={{this.dummy.user.email}}>
-            <DButton @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
+            <DButton @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
           </dd>
           <dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt>
           <dd class="groups">
@@ -237,7 +237,7 @@
           <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd>
           <dt>{{i18n "user.email.title"}}</dt>
           <dd title={{this.dummy.user.email}}>
-            <DButton @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
+            <DButton @icon="envelope" @label="admin.users.check_email.text" @class="btn-primary" />
           </dd>
           <dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt>
           <dd class="groups">