diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index 044bc36ca97..eaaa9fcde18 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -39,7 +39,7 @@
           content=badgeGroupings
           class="badge-selector"
           nameProperty="name"}}
-        <button {{action "editGroupings"}} class='btn btn-icon no-text btn-default'>{{d-icon 'pencil'}}</button>
+        <button {{action "editGroupings"}} class='btn btn-icon no-text btn-default'>{{d-icon "pencil-alt"}}</button>
       </div>
     </div>
 
diff --git a/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
index 8ffa93b9faa..354707edb5d 100644
--- a/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
@@ -11,6 +11,6 @@
     {{d-button class="btn-default" action=(action "save") label="admin.user_fields.save"}}
     <a href {{action "edit"}}>{{i18n 'cancel'}}</a>
   {{else}}
-    {{d-button class="btn-default" action=(action "edit") icon="pencil"}}
+    {{d-button class="btn-default" action=(action "edit") icon="pencil-alt"}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 46c6ac46ae6..fef8cb074d2 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -46,9 +46,9 @@
     </div>
     <div class='form-display'>{{fieldName}}</div>
     <div class='form-element controls'>
-      {{d-button action=(action "edit") class="btn-default" icon="pencil" label="admin.user_fields.edit"}}
+      {{d-button action=(action "edit") class="btn-default" icon="pencil-alt" label="admin.user_fields.edit"}}
 
-      {{d-button action=destroyAction actionParam=userField class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}}
+      {{d-button action=destroyAction actionParam=userField class="btn-danger" icon="far-trash-alt" label="admin.user_fields.delete"}}
       {{d-button action=moveUpAction actionParam=userField class="btn-default" icon="arrow-up" disabled=cantMoveUp}}
       {{d-button action=moveDownAction actionParam=userField class="btn-default" icon="arrow-down" disabled=cantMoveDown}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index 0c5acf83225..559544abcef 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -25,7 +25,7 @@
   <td><div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>{{host.path_whitelist}}</td>
   <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category}}</td>
   <td class="controls">
-    {{d-button icon="pencil" action=(action "edit")}}
-    {{d-button icon="trash-o" action=(action "delete") class='btn-danger'}}
+    {{d-button icon="pencil-alt" action=(action "edit")}}
+    {{d-button icon="far-trash-alt" action=(action "delete") class='btn-danger'}}
   </td>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
index 98d0120bd6e..6d96983b2d6 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
@@ -7,7 +7,7 @@
         {{/link-to}}
         {{#if flaggedPost.wasEdited}}
           <div class='edited-after'>
-            {{d-icon "pencil" title="admin.flags.was_edited"}}
+            {{d-icon "pencil-alt" title="admin.flags.was_edited"}}
           </div>
         {{/if}}
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 03f6342cdab..50fb7d413e4 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -11,7 +11,7 @@
   </div>
 {{else if setting.overridden}}
   {{#if setting.secret}}
-    {{d-button action=(action "toggleSecret") icon="eye-slash"}}
+    {{d-button action=(action "toggleSecret") icon="far-eye-slash"}}
   {{/if}}
   {{d-button class="btn-default undo" action=(action "resetDefault") icon="undo" label="admin.settings.reset"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index 90e984ffeea..fd44f997f6a 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -11,7 +11,7 @@
       {{i18n "admin.customize.theme_owner"}}
       {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
       {{else}}
-      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'admin.customize.delete'}}</button>
+      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'admin.customize.delete'}}</button>
       {{/if}}
       <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index fd47daf70d3..4fc19567623 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -5,7 +5,7 @@
       {{d-button action=(action "finishedEditingName") class="btn-primary submit-edit" icon="check"}}
       {{d-button action=(action "cancelEditingName") class="btn-default cancel-edit" icon="times"}}
     {{else}}
-      {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a>
+      {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil-alt"}}</a>
     {{/if}}
   </div>
 
@@ -178,5 +178,5 @@
   <a class="btn btn-default export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
-  {{d-button action=(action "destroy") label="admin.customize.delete" icon="trash" class="btn-danger"}}
+  {{d-button action=(action "destroy") label="admin.customize.delete" icon="trash-alt" class="btn-danger"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 479b7421d67..f677287654d 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -20,7 +20,7 @@
             <tr>
               <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
               <th>:{{e.name}}:</th>
-              <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon 'trash-o'}} </button></th>
+              <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon "far-trash-alt"}} </button></th>
             </tr>
           {{/each}}
         </tbody>
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index 68a7bbc5687..4e1def35b39 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -1,7 +1,7 @@
 <p>{{i18n 'admin.logs.screened_ips.description'}}</p>
 
 <div class="screened-ip-controls">
-  <div class="filter-screened-ip-address"> 
+  <div class="filter-screened-ip-address">
     {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}}
     {{d-button class="btn-default" action=(action "rollUp") title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
     {{d-button class="btn-default" action=(action "exportScreenedIpList") icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
@@ -52,13 +52,13 @@
 
           <td class="col last_match_at">
             {{#if item.last_match_at}}
-               <div class="label">{{i18n 'admin.logs.last_match_at'}} {{age-with-tooltip item.last_match_at}}</div>  
+               <div class="label">{{i18n 'admin.logs.last_match_at'}} {{age-with-tooltip item.last_match_at}}</div>
             {{/if}}
           </td>
           <td class="col actions">
             {{#unless item.editing}}
-              {{d-button class="btn-default" action=(action "destroy") actionParam=item icon="trash-o" class="btn-danger"}}
-              {{d-button class="btn-default"action=(action "edit") actionParam=item icon="pencil"}}
+              {{d-button class="btn-default" action=(action "destroy") actionParam=item icon="far-trash-alt" class="btn-danger"}}
+              {{d-button class="btn-default"action=(action "edit") actionParam=item icon="pencil-alt"}}
               {{#if item.isBlocked}}
                 {{d-button class="btn-default" action=(action "allow") actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
               {{else}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 822dfce0a70..dc7438e1ec7 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -62,7 +62,7 @@
               <a {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
             {{else}}
               <span class="deleted-user" title="{{i18n 'admin.user.deleted'}}">
-                {{d-icon "trash-o"}}
+                {{d-icon "far-trash-alt"}}
               </span>
             {{/if}}
           </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
index 958467e6b73..279a805cbc2 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
@@ -12,7 +12,7 @@
           {{/if}}
         </div>
         <div class='actions'>
-          <button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon 'pencil'}}</button>
+          <button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon "pencil-alt"}}</button>
           <button {{action "up" wc}} class="btn no-text">{{d-icon 'toggle-up'}}</button>
           <button {{action "down" wc}} class="btn no-text">{{d-icon 'toggle-down'}}</button>
           <button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{d-icon 'times'}}</button>
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index 75d3d6edced..19ab2413f39 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -42,7 +42,7 @@
             {{/if}}
           </td>
           <td class="col action">
-            {{d-button action=(action "destroy") actionParam=pl icon="trash-o" class="btn-danger"}}
+            {{d-button action=(action "destroy") actionParam=pl icon="far-trash-alt" class="btn-danger"}}
           </td>
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index 873053a6e2a..cf2be40ee47 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -49,7 +49,7 @@
           <td class="settings">
             {{#if currentUser.admin}}
               {{#if plugin.enabled_setting}}
-                {{d-button class="btn-default" action=(route-action "showSettings") actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}}
+                {{d-button class="btn-default" action=(route-action "showSettings") actionParam=plugin icon="cog" label="admin.plugins.change_settings_short"}}
               {{/if}}
             {{/if}}
           </td>
diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs
index b2e0d775480..9b41e0976de 100644
--- a/app/assets/javascripts/admin/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/templates/plugins.hbs
@@ -5,7 +5,7 @@
 
   {{#if currentUser.admin}}
     {{d-button label="admin.plugins.change_settings"
-               icon="gear"
+               icon="cog"
                class="btn-default settings-button"
                action=(route-action "showSettings")}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index b780ec84aa1..4c7dc5453f6 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -259,10 +259,10 @@
     <div class='value'>{{i18n-yes-no model.admin}}</div>
     <div class='controls'>
       {{#if model.can_revoke_admin}}
-        {{d-button class="btn-default" action=(action "revokeAdmin") icon="shield" label="admin.user.revoke_admin"}}
+        {{d-button class="btn-default" action=(action "revokeAdmin") icon="shield-alt" label="admin.user.revoke_admin"}}
       {{/if}}
       {{#if model.can_grant_admin}}
-        {{d-button class="btn-default" action=(action "grantAdmin") icon="shield" label="admin.user.grant_admin"}}
+        {{d-button class="btn-default" action=(action "grantAdmin") icon="shield-alt" label="admin.user.grant_admin"}}
       {{/if}}
     </div>
   </div>
@@ -272,10 +272,10 @@
     <div class='value'>{{i18n-yes-no model.moderator}}</div>
     <div class='controls'>
       {{#if model.can_revoke_moderation}}
-        {{d-button class="btn-default" action=(action "revokeModeration") icon="shield" label="admin.user.revoke_moderation"}}
+        {{d-button class="btn-default" action=(action "revokeModeration") icon="shield-alt" label="admin.user.revoke_moderation"}}
       {{/if}}
       {{#if model.can_grant_moderation}}
-        {{d-button class="btn-default" action=(action "grantModeration") icon="shield" label="admin.user.grant_moderation"}}
+        {{d-button class="btn-default" action=(action "grantModeration") icon="shield-alt" label="admin.user.grant_moderation"}}
       {{/if}}
     </div>
   </div>
@@ -480,7 +480,7 @@
     <div class='controls'>
       {{#if model.can_delete_all_posts}}
         {{#if model.post_count}}
-          {{d-button class="btn-danger" action=(action "deleteAllPosts") icon="trash-o" label="admin.user.delete_all_posts"}}
+          {{d-button class="btn-danger" action=(action "deleteAllPosts") icon="far-trash-alt" label="admin.user.delete_all_posts"}}
         {{/if}}
       {{else}}
         {{deleteAllPostsExplanation}}
diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6 b/app/assets/javascripts/discourse/components/auth-token-dropdown.es6
index 2dceb6e59cc..8b3630b7dc5 100644
--- a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6
+++ b/app/assets/javascripts/discourse/components/auth-token-dropdown.es6
@@ -16,7 +16,7 @@ export default DropdownSelectBoxComponent.extend({
       },
       {
         id: "logOut",
-        icon: "sign-out",
+        icon: "sign-out-alt",
         name: I18n.t("user.log_out"),
         description: ""
       }
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 341f0380295..fe0a627a1b6 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -835,7 +835,7 @@ export default Ember.Component.extend({
       toolbar.addButton({
         id: "options",
         group: "extras",
-        icon: "gear",
+        icon: "cog",
         title: "composer.options",
         sendAction: this.onExpandPopupMenuOptions.bind(this),
         popupMenu: true
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
index 5e7ea9ec533..4b3c16f8b49 100644
--- a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
@@ -32,7 +32,7 @@ export default DropdownSelectBoxComponent.extend({
           description: I18n.t("groups.members.remove_owner_description", {
             username: this.get("member.username")
           }),
-          icon: "shield"
+          icon: "shield-alt"
         });
       } else {
         items.push({
@@ -41,7 +41,7 @@ export default DropdownSelectBoxComponent.extend({
           description: I18n.t("groups.members.make_owner_description", {
             username: this.get("member.username")
           }),
-          icon: "shield"
+          icon: "shield-alt"
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 8fcb580dadd..30a93295a0e 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -41,7 +41,7 @@ export default Ember.Component.extend(
 
       let autoCloseHours = this.get("duration") || 0;
 
-      buffer.push(`<h3>${iconHTML("clock-o")} `);
+      buffer.push(`<h3>${iconHTML("far-clock")} `);
 
       let options = {
         timeLeft: duration.humanize(true),
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 131bd6d3019..6760e0279b7 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -222,7 +222,7 @@ export default Ember.Controller.extend({
   @computed("model.action", "isWhispering")
   saveIcon(action, isWhispering) {
     if (isWhispering) {
-      return "eye-slash";
+      return "far-eye-slash";
     }
     return SAVE_ICONS[action];
   },
@@ -267,7 +267,7 @@ export default Ember.Controller.extend({
         this._setupPopupMenuOption(() => {
           return {
             action: "toggleInvisible",
-            icon: "eye-slash",
+            icon: "far-eye-slash",
             label: "composer.toggle_unlisted",
             condition: "canUnlistTopic"
           };
@@ -278,7 +278,7 @@ export default Ember.Controller.extend({
         this._setupPopupMenuOption(() => {
           return {
             action: "toggleWhisper",
-            icon: "eye-slash",
+            icon: "far-eye-slash",
             label: "composer.toggle_whisper",
             condition: "showWhisperToggle"
           };
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
index 8703739cdbd..89badf83965 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -22,7 +22,7 @@ function addBulkButton(action, key, opts) {
 
 // Default buttons
 addBulkButton("showChangeCategory", "change_category", {
-  icon: "pencil",
+  icon: "pencil-alt",
   class: "btn-default"
 });
 addBulkButton("closeTopics", "close_topics", {
@@ -42,12 +42,12 @@ addBulkButton("resetRead", "reset_read", {
   class: "btn-default"
 });
 addBulkButton("unlistTopics", "unlist_topics", {
-  icon: "eye-slash",
+  icon: "far-eye-slash",
   class: "btn-default",
   buttonVisible: topics => topics.some(t => t.visible)
 });
 addBulkButton("relistTopics", "relist_topics", {
-  icon: "eye",
+  icon: "far-eye",
   class: "btn-default",
   buttonVisible: topics => topics.some(t => !t.visible)
 });
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index c8500888f4d..b3706ca4e27 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -14,10 +14,12 @@ export default htmlHelper((user, args) => {
   }
 
   if (currentUser && user.get("admin") && currentUser.get("staff")) {
-    return iconHTML("shield", { label: I18n.t("user.admin", { user: name }) });
+    return iconHTML("shield-alt", {
+      label: I18n.t("user.admin", { user: name })
+    });
   }
   if (user.get("moderator")) {
-    return iconHTML("shield", {
+    return iconHTML("shield-alt", {
       label: I18n.t("user.moderator", { user: name })
     });
   }
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index ecaff63a638..f237987af84 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -369,7 +369,7 @@ class PluginApi {
    * api.addToolbarPopupMenuOptionsCallback(() => {
    *  return {
    *    action: 'toggleWhisper',
-   *    icon: 'eye-slash',
+   *    icon: 'far-eye-slash',
    *    label: 'composer.toggle_whisper',
    *    condition: "canWhisper"
    *  };
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index cb87d2639ed..e71223f337d 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -415,7 +415,7 @@ export function allowsAttachments() {
 }
 
 export function uploadIcon() {
-  return allowsAttachments() ? "upload" : "picture-o";
+  return allowsAttachments() ? "upload" : "far-image";
 }
 
 export function uploadLocation(url) {
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index 4bb710d6630..8f2d6986a01 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -141,7 +141,7 @@ const UserAction = RestModel.extend({
       groups = {
         likes: UserActionGroup.create({ icon: "heart" }),
         stars: UserActionGroup.create({ icon: "star" }),
-        edits: UserActionGroup.create({ icon: "pencil" }),
+        edits: UserActionGroup.create({ icon: "pencil-alt" }),
         bookmarks: UserActionGroup.create({ icon: "bookmark" })
       };
     }
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index a7078f10ca1..933bc48de8e 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -15,7 +15,7 @@
             {{d-button
               class="btn btn-default pad-left no-text"
               action=(action "toggleSetUserTitle")
-              icon="pencil"}}
+              icon="pencil-alt"}}
           </div>
         {{/if}}
         {{#if model.multiple_grant}}
diff --git a/app/assets/javascripts/discourse/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/templates/components/activation-controls.hbs
index 0b94c0ef944..a311180f53c 100644
--- a/app/assets/javascripts/discourse/templates/components/activation-controls.hbs
+++ b/app/assets/javascripts/discourse/templates/components/activation-controls.hbs
@@ -7,5 +7,5 @@
 
 {{d-button action=editActivationEmail
            label="login.change_email"
-           icon="pencil"
+           icon="pencil-alt"
            class="edit-email"}}
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index f6b2102c92a..e980fc50629 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,5 +1,5 @@
 <label class="btn" disabled={{uploading}} title="{{i18n 'user.change_avatar.upload_title'}}">
-  {{d-icon "picture-o"}}&nbsp;{{uploadButtonText}}
+  {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" />
 </label>
 {{#if uploading}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
index 71368b2713f..8f010be7cec 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
@@ -1,5 +1,5 @@
 {{#if isEditing}}
-  {{d-icon "pencil"}}
+  {{d-icon "pencil-alt"}}
 {{else}}
   {{composer-actions
     composerModel=model
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index c9f50287bce..1c01b53db7f 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -31,7 +31,7 @@
       {{/if}}
       {{#if category.topic_url}}
         <br>
-        {{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil" label="category.change_in_category_topic"}}
+        {{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil-alt" label="category.change_in_category_topic"}}
       {{/if}}
     </section>
   {{/if}}
@@ -56,7 +56,7 @@
             <span class='add-on'>#</span>{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
             {{color-picker colors=foregroundColors value=category.text_color id='edit-text-color'}}
           </div>
-        </div>        
+        </div>
       </div>
     </section>
   {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index e7d1cea3b54..645fbc4f6bc 100644
--- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -14,11 +14,11 @@
 
   {{#if isCustom}}
     <div class="control-group">
-      {{d-icon "calendar"}} {{date-picker-future value=date defaultDate=date}}
+      {{d-icon "calendar-alt"}} {{date-picker-future value=date defaultDate=date}}
     </div>
 
     <div class="control-group">
-      {{d-icon "clock-o"}}
+      {{d-icon "far-clock"}}
       {{input type="time" value=time}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 977b4c67319..13db8aa1001 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -1,11 +1,11 @@
 <div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}>
   <div class="image-upload-controls">
     <label class="btn btn-default pad-left no-text {{if uploading 'disabled'}}">
-      {{d-icon "picture-o"}}
+      {{d-icon "far-image"}}
       <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" />
     </label>
     {{#if hasBackgroundStyle}}
-      <button {{action "trash"}} class="btn btn-danger pad-left no-text">{{d-icon "trash-o"}}</button>
+      <button {{action "trash"}} class="btn btn-danger pad-left no-text">{{d-icon "far-trash-alt"}}</button>
     {{/if}}
     <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
index 6c53367c14b..9553785082d 100644
--- a/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/images-uploader.hbs
@@ -1,5 +1,5 @@
 <label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}">
-  {{d-icon "picture-o"}}&nbsp;{{uploadButtonText}}
+  {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
   <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple />
 </label>
 {{#if uploading}}
diff --git a/app/assets/javascripts/discourse/templates/components/queued-post.hbs b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
index 285337ea4b8..f8a73cd8f98 100644
--- a/app/assets/javascripts/discourse/templates/components/queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
@@ -81,13 +81,13 @@
           {{d-button action=(action "deleteUser")
                      disabled=post.isSaving
                      label="queue.delete_user"
-                     icon="trash"
+                     icon="trash-alt"
                      class="btn-danger delete-user"}}
         {{/if}}
         {{d-button action=(action "edit")
                    disabled=post.isSaving
                    label="queue.edit"
-                   icon="pencil"
+                   icon="pencil-alt"
                    class="edit"}}
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index eb8aa968f85..6b4adbe0ca5 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -24,5 +24,5 @@
 {{/if}}
 
 <div class='link'>
-  <a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{d-icon "close"}}</a>
+  <a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{d-icon "times"}}</a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index b909adde57b..05289b21d4c 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -64,7 +64,7 @@
     {{d-button class="btn-default edit-message"
                title="topic.edit_message.help"
                label="topic.edit_message.title"
-               icon="pencil"
+               icon="pencil-alt"
                action=editFirstPost}}
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
index 56c082a0d60..b8c69759bed 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -22,7 +22,7 @@
 
   {{#if item.deleted_by}}
     <span class="delete-info">
-      {{d-icon "trash-o"}}
+      {{d-icon "far-trash-alt"}}
       {{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
       {{format-date item.deleted_at leaveAgo="true"}}
     </span>
@@ -61,7 +61,7 @@
 
 {{#if item.editableDraft}}
   <div class='user-stream-item-draft-actions'>
-    {{d-button action=resumeDraft actionParam=item icon="pencil" label='drafts.resume' class="btn-default resume-draft"}}
-    {{d-button action=removeDraft actionParam=item icon="trash-o" label='drafts.remove' class="btn-default remove-draft"}}
+    {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label='drafts.resume' class="btn-default resume-draft"}}
+    {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label='drafts.remove' class="btn-default remove-draft"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index c991f58c214..8f1cc2150ab 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -26,7 +26,7 @@
 
                   {{#unless site.mobileView}}
                     {{#if isWhispering}}
-                      <span class='whisper'>{{d-icon 'eye-slash'}}</span>
+                      <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
                     {{/if}}
                     {{#if model.unlistTopic}}
                       <span class='whisper'>({{i18n 'composer.unlist'}})</span>
@@ -128,7 +128,7 @@
                   {{#if canEdit}}
                     {{d-icon "times"}}
                   {{else}}
-                    {{d-icon "trash-o"}}
+                    {{d-icon "far-trash-alt"}}
                   {{/if}}
                 </a>
               {{else}}
@@ -140,7 +140,7 @@
               {{#if site.mobileView}}
                 {{#if whisperOrUnlistTopic}}
                   <span class='whisper'>
-                    {{d-icon "eye-slash"}}
+                    {{d-icon "far-eye-slash"}}
                   </span>
                 {{/if}}
                 {{#if model.noBump}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index 60493d75265..e37bdb2aa0c 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
 <p>{{{message.body}}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index a91a313e0f8..c2d574cb690 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
index bdd2cd5a3f2..6972b13d07f 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
@@ -1,4 +1,4 @@
-<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 <h3>{{i18n 'composer.similar_topics'}}</h3>
 
 <ul class='topics'>
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
index b148675b34c..40c14709db3 100644
--- a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
+++ b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
@@ -31,7 +31,7 @@
     <div class='section' data-section='recent'>
       <div class='section-header'>
         <span class="title">{{i18n 'emoji_picker.recent'}}</span>
-        <a href='#' class='clear-recent'>{{d-icon 'trash'}}</a>
+        <a href='#' class='clear-recent'>{{d-icon "trash-alt"}}</a>
       </div>
       <div class='section-group'></div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 669221a852d..bb593409f6b 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -47,7 +47,7 @@
       {{#if currentUser.admin}}
         {{d-button action=(action "destroy")
             disabled=destroying
-            icon="trash"
+            icon="trash-alt"
             class='btn-danger'
             label="admin.groups.delete"}}
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 52f738a0194..32230987d49 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -60,7 +60,7 @@
                     {{#if group.public_admission}}
                       {{i18n 'groups.index.public'}}
                     {{else if group.isPrivate}}
-                      {{d-icon "eye-slash"}}
+                      {{d-icon "far-eye-slash"}}
                       {{i18n 'groups.index.private'}}
                     {{else}}
                       {{#if group.automatic}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index b0871e8fc2b..6b163a76420 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -7,7 +7,7 @@
   <div>
     <h3>{{i18n 'user.auth_tokens.details'}}</h3>
     <ul style="list-style-type:none">
-      <li>{{d-icon "clock-o"}} {{format-date model.seen_at}}</li>
+      <li>{{d-icon "far-clock"}} {{format-date model.seen_at}}</li>
       <li>{{d-icon "map-marker"}} {{model.location}}</li>
       <li>{{d-icon model.icon}} {{i18n "user.auth_tokens.browser_and_device" browser=model.browser device=model.device}}</li>
     </ul>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 2366e00ea23..675754b7cfe 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -25,7 +25,7 @@
       {{d-button class="btn-danger pull-right"
                  disabled=deleteDisabled
                  action=(action "deleteCategory")
-                 icon="trash-o"
+                 icon="far-trash-alt"
                  label="category.delete"}}
     {{else if model.id}}
       <div class="disable_info_wrap">
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 64ecae52880..2bc1ce3cd36 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -51,7 +51,7 @@
         {{else}}
           <p class="with-validation">
             {{{pinMessage}}}
-            {{d-icon "clock-o"}}
+            {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
               includeFarFuture=true
@@ -95,7 +95,7 @@
         {{else}}
           <p class="with-validation">
             {{i18n "topic.feature_topic.pin_globally"}}
-            {{d-icon "clock-o"}}
+            {{d-icon "far-clock"}}
             {{future-date-input
               class="pin-until"
               includeFarFuture=true
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 2ff3bc1601c..969e5262657 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -15,7 +15,7 @@
     {{#if displayEdit}}
       {{d-button action=(action "editPost")
           class="btn-default"
-          icon="pencil"
+          icon="pencil-alt"
           label=editButtonLabel}}
     {{/if}}
 
@@ -41,7 +41,7 @@
     </div>
   </div>
   <div id="revision-details">
-    {{d-icon "pencil"}}
+    {{d-icon "pencil-alt"}}
     {{#link-to 'user' model.username}}
       {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
     {{/link-to}}
@@ -58,7 +58,7 @@
         &mdash; {{disabled-icon icon="pencil-square-o" disabled=wikiDisabled}}
       {{/if}}
       {{#if model.post_type_changes}}
-        &mdash; {{disabled-icon icon="shield" disabled=postTypeDisabled}}
+        &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
       {{/if}}
       {{#if model.category_id_changes}}
         &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
@@ -85,7 +85,7 @@
       {{/if}}
       {{#if model.post_type_changes}}
         <div class="row">
-          {{disabled-icon icon="shield" disabled=postTypeDisabled}}
+          {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
         </div>
       {{/if}}
       {{#if model.category_id_changes}}
@@ -128,7 +128,7 @@
     {{/if}}
 
     {{#if displayHide}}
-      {{d-button action=(action "hideVersion") icon="eye-slash" label="post.revisions.controls.hide" class="btn-danger" disabled=loading}}
+      {{d-button action=(action "hideVersion") icon="far-eye-slash" label="post.revisions.controls.hide" class="btn-danger" disabled=loading}}
     {{/if}}
 
     {{#if displayShow}}
@@ -137,7 +137,7 @@
 
     {{#if displayEdit}}
       {{d-button action=(action "editPost")
-          icon="pencil"
+          icon="pencil-alt"
           class="btn-default"
           label=editButtonLabel}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index dc880aea42b..e268806e9b7 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -107,6 +107,6 @@
 
 <div class="modal-footer">
   {{#d-button class="btn-primary" disabled=buttonDisabled action=(action "performMove")}}
-    {{d-icon 'sign-out'}} {{buttonTitle}}
+    {{d-icon "sign-out-alt"}} {{buttonTitle}}
   {{/d-button}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 93cf10f0426..e94154ab9e9 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -4,7 +4,7 @@
     <span class='static'>{{model.username}}</span>
     {{#if model.can_edit_username}}
       {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
-      {{d-icon "pencil"}} {{/link-to}}
+      {{d-icon "pencil-alt"}} {{/link-to}}
     {{/if}}
   </div>
   {{#if siteSettings.enable_mentions}}
@@ -37,7 +37,7 @@
       <div class="controls">
         <span class='static'>{{model.email}}</span>
         {{#if model.can_edit_email}}
-          {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
+          {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil-alt"}}{{/link-to}}
         {{/if}}
       </div>
       <div class='instructions'>
@@ -76,7 +76,7 @@
 
     {{#if isCurrentUser}}
       {{#link-to "preferences.second-factor" class="btn btn-default btn-small btn-icon pad-left no-text"}}
-        {{d-icon "pencil"}}
+        {{d-icon "pencil-alt"}}
       {{/link-to}}
     {{/if}}
   </div>
@@ -91,7 +91,7 @@
 
       {{#if isCurrentUser}}
         {{#link-to "preferences.second-factor-backup" class="btn btn-default btn-small btn-icon pad-left no-text"}}
-          {{d-icon "pencil"}}
+          {{d-icon "pencil-alt"}}
         {{/link-to}}
       {{/if}}
     {{/if}}
@@ -113,7 +113,7 @@
             <td>
               {{#if authProvider.method.can_revoke}}
                 {{#conditional-loading-spinner condition=revoking size='small'}}
-                  {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash" }}
+                  {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" }}
                 {{/conditional-loading-spinner}}
               {{/if}}
             </td>
@@ -144,7 +144,7 @@
     <div class="controls">
       {{! we want the "huge" version even though we're downsizing it in CSS }}
       {{bound-avatar model "huge"}}
-      {{d-button action=(route-action "showAvatarSelector") actionParam=model class="btn-default pad-left" icon="pencil"}}
+      {{d-button action=(route-action "showAvatarSelector") actionParam=model class="btn-default pad-left" icon="pencil-alt"}}
     </div>
   </div>
 {{/unless}}
@@ -199,7 +199,7 @@
       </a>
     {{/if}}
 
-    <a {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out"}} {{i18n 'user.auth_tokens.log_out_all'}}</a>
+    <a {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n 'user.auth_tokens.log_out_all'}}</a>
   </div>
 {{/if}}
 
@@ -222,7 +222,7 @@
   <div class="control-group delete-account">
     <br/>
     <div class="controls">
-      {{d-button action=(action "delete") disabled=deleteDisabled class="btn-danger" icon="trash-o" label="user.delete_account"}}
+      {{d-button action=(action "delete") disabled=deleteDisabled class="btn-danger" icon="far-trash-alt" label="user.delete_account"}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/templates/selected-posts.hbs
index 4fc8598957e..517bd3a00aa 100644
--- a/app/assets/javascripts/discourse/templates/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/selected-posts.hbs
@@ -9,11 +9,11 @@
 {{/if}}
 
 {{#if canDeleteSelected}}
-  {{d-button action=(action "deleteSelected") icon="trash-o" label="topic.multi_select.delete" class="btn-danger"}}
+  {{d-button action=(action "deleteSelected") icon="far-trash-alt" label="topic.multi_select.delete" class="btn-danger"}}
 {{/if}}
 
 {{#if canMergeTopic}}
-  {{d-button action=(route-action "moveToTopic") icon="sign-out" label="topic.move_to.action" class="move-to-topic"}}
+  {{d-button action=(route-action "moveToTopic") icon="sign-out-alt" label="topic.move_to.action" class="move-to-topic"}}
 {{/if}}
 
 {{#if canChangeOwner}}
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
index 8fbb0dad27d..65e1b8e6d6e 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
@@ -44,6 +44,6 @@
   </section>
 
   <button {{action "save"}} disabled={{model.disableSave}} class='btn btn-default'>{{i18n 'tagging.groups.save'}}</button>
-  <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button>
+  <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'tagging.groups.delete'}}</button>
   <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index f4ce518846f..a44140b9e77 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -40,8 +40,8 @@
       action=(route-action "createTopic")}}
 
      {{#if showAdminControls}}
-        {{d-button action=(route-action "renameTag") actionParam=tag icon="pencil" class="admin-tag"}}
-        {{d-button action=(action "deleteTag") icon="trash-o" class="admin-tag btn-danger"}}
+        {{d-button action=(route-action "renameTag") actionParam=tag icon="pencil-alt" class="admin-tag"}}
+        {{d-button action=(action "deleteTag") icon="far-trash-alt" class="admin-tag btn-danger"}}
       {{/if}}
     </section>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b92445f0703..4a64ecf3856 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -63,7 +63,7 @@
             {{/if}}
 
             {{#if model.details.can_edit}}
-              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil"}}</a>
+              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil-alt"}}</a>
             {{/if}}
           </h1>
 
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
index 8fd1d2d7313..bba7b702b75 100644
--- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
+++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
@@ -162,7 +162,7 @@ createWidget("deleted-post", {
 
   html(attrs) {
     return [
-      iconNode("trash-o"),
+      iconNode("far-trash-alt"),
       " ",
       avatarFor.call(this, "small", {
         template: attrs.deletedByAvatarTemplate,
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index deb4f1cbfc1..5e94ddd8a47 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -80,7 +80,7 @@ export default createWidget("hamburger-menu", {
     if (currentUser.admin) {
       links.push({
         href: "/admin/site_settings/category/required",
-        icon: "gear",
+        icon: "cog",
         label: "admin.site_settings.title",
         className: "settings-link"
       });
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index 29732a34234..4dd16031d1d 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -31,7 +31,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
   if (!attrs.isWhisper && currentUser.staff) {
     const buttonAtts = {
       action: "togglePostType",
-      icon: "shield",
+      icon: "shield-alt",
       className: "btn-default toggle-post-type"
     };
 
@@ -53,7 +53,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
 
     if (attrs.hidden) {
       contents.push({
-        icon: "eye",
+        icon: "far-eye",
         label: "post.controls.unhide",
         action: "unhidePost",
         className: "btn-default unhide-post"
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index 84c6f70d6bd..aeacc523375 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -164,7 +164,7 @@ export default class PostCooked {
         })
         .catch(e => {
           if ([403, 404].includes(e.jqXHR.status)) {
-            const icon = e.jqXHR.status === 403 ? "lock" : "trash-o";
+            const icon = e.jqXHR.status === 403 ? "lock" : "far-trash-alt";
             $blockQuote.showHtml(
               $(`<div class='expanded-quote'>${iconHTML(icon)}</div>`),
               "fast",
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
index 451e2332595..8d5b1739af9 100644
--- a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
@@ -33,7 +33,7 @@ export default createWidget("post-edits-indicator", {
   },
 
   html(attrs) {
-    let icon = "pencil";
+    let icon = "pencil-alt";
     const updatedAt = new Date(attrs.updated_at);
     let className = this.historyHeat(updatedAt);
     const date = longDate(updatedAt);
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index a0f00d1a73a..bab75ab4d1f 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -125,7 +125,7 @@ registerButton("edit", attrs => {
       action: "editPost",
       className: "edit",
       title: "post.controls.edit",
-      icon: "pencil",
+      icon: "pencil-alt",
       alwaysShowYours: true
     };
   }
@@ -268,7 +268,7 @@ registerButton("delete", attrs => {
       id: "delete_topic",
       action: "deletePost",
       title: "post.controls.delete_topic",
-      icon: "trash-o",
+      icon: "far-trash-alt",
       className: "delete"
     };
   } else if (attrs.canRecover) {
@@ -284,7 +284,7 @@ registerButton("delete", attrs => {
       id: "delete",
       action: "deletePost",
       title: "post.controls.delete",
-      icon: "trash-o",
+      icon: "far-trash-alt",
       className: "delete"
     };
   } else if (!attrs.canDelete && attrs.firstPost && attrs.yours) {
@@ -292,7 +292,7 @@ registerButton("delete", attrs => {
       id: "delete_topic",
       action: "showDeleteTopicModal",
       title: "post.controls.delete_topic_disallowed",
-      icon: "trash-o",
+      icon: "far-trash-alt",
       className: "delete"
     };
   }
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
index 984555ab662..b1caf065b6a 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
@@ -81,7 +81,7 @@ export default createWidget("post-small-action", {
       contents.push(
         this.attach("button", {
           className: "small-action-delete",
-          icon: "trash",
+          icon: "trash-alt",
           action: "deletePost",
           title: "post.controls.delete"
         })
@@ -92,7 +92,7 @@ export default createWidget("post-small-action", {
       contents.push(
         this.attach("button", {
           className: "small-action-edit",
-          icon: "pencil",
+          icon: "pencil-alt",
           action: "editPost",
           title: "post.controls.edit"
         })
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 51a46c97fb5..671b7b9105a 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -153,7 +153,7 @@ createWidget("post-avatar", {
   html(attrs) {
     let body;
     if (!attrs.user_id) {
-      body = iconNode("trash-o", { class: "deleted-user-avatar" });
+      body = iconNode("far-trash-alt", { class: "deleted-user-avatar" });
     } else {
       body = avatarFor.call(this, this.settings.size, {
         template: attrs.avatar_template,
@@ -236,7 +236,7 @@ createWidget("post-meta-data", {
           {
             attributes: { title: I18n.t("post.whisper") }
           },
-          iconNode("eye-slash")
+          iconNode("far-eye-slash")
         )
       );
     }
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
index 7c1a29a6158..9d21c0412bd 100644
--- a/app/assets/javascripts/discourse/widgets/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
@@ -42,7 +42,9 @@ export default createWidget("poster-name", {
   // TODO: Allow extensibility
   posterGlyph(attrs) {
     if (attrs.moderator) {
-      return iconNode("shield", { title: I18n.t("user.moderator_tooltip") });
+      return iconNode("shield-alt", {
+        title: I18n.t("user.moderator_tooltip")
+      });
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index b73cdf52d3b..38e420369f9 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -147,7 +147,7 @@ export default createWidget("topic-admin-menu", {
         className: "topic-admin-delete",
         buttonClass: "btn-danger",
         action: "deleteTopic",
-        icon: "trash-o",
+        icon: "far-trash-alt",
         label: "actions.delete"
       });
     }
@@ -184,7 +184,7 @@ export default createWidget("topic-admin-menu", {
       className: "topic-admin-status-update",
       buttonClass: "btn-default",
       action: "showTopicStatusUpdate",
-      icon: "clock-o",
+      icon: "far-clock",
       label: "actions.timed_update"
     });
 
@@ -206,7 +206,7 @@ export default createWidget("topic-admin-menu", {
         className: "topic-admin-change-timestamp",
         buttonClass: "btn-default",
         action: "showChangeTimestamp",
-        icon: "calendar",
+        icon: "calendar-alt",
         label: "change_timestamp.title"
       });
     }
@@ -234,7 +234,7 @@ export default createWidget("topic-admin-menu", {
       className: "topic-admin-visible",
       buttonClass: "btn-default",
       action: "toggleVisibility",
-      icon: visible ? "eye-slash" : "eye",
+      icon: visible ? "far-eye-slash" : "far-eye",
       label: visible ? "actions.invisible" : "actions.visible"
     });
 
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index d0261e2d75e..727c18fc1fe 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -89,7 +89,7 @@ createWidget("user-menu-links", {
     glyphs.push({
       label: "user.preferences",
       className: "user-preferences-link",
-      icon: "gear",
+      icon: "cog",
       href: `${path}/preferences/account`
     });
 
@@ -161,7 +161,7 @@ export default createWidget("user-menu", {
               this.attach("link", {
                 action: "logout",
                 className: "logout",
-                icon: "sign-out",
+                icon: "sign-out-alt",
                 href: "",
                 label: "user.log_out"
               })
diff --git a/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
index 0a7af1b3515..8ef25f08631 100644
--- a/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
@@ -32,7 +32,7 @@ export default DropdownSelectBox.extend({
 
     if (post.user_deleted) {
       content.push({
-        icon: "eye",
+        icon: "far-eye",
         id: "confirm-agree-restore",
         action: () => this.send("perform", "restore"),
         label: I18n.t("admin.flags.agree_flag_restore_post"),
@@ -41,7 +41,7 @@ export default DropdownSelectBox.extend({
     } else {
       if (!post.get("postHidden")) {
         content.push({
-          icon: "eye-slash",
+          icon: "far-eye-slash",
           action: () => this.send("perform", "hide"),
           id: "confirm-agree-hide",
           label: I18n.t("admin.flags.agree_flag_hide_post"),
diff --git a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
index 39c9f54bb42..422385ebd18 100644
--- a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
@@ -6,7 +6,7 @@ export default DropdownSelectBox.extend({
   classNames: ["delete-flag", "admin-delete-flag-dropdown"],
   adminTools: Ember.inject.service(),
   nameProperty: "label",
-  headerIcon: "trash-o",
+  headerIcon: "far-trash-alt",
 
   computeHeaderContent() {
     let content = this._super(...arguments);
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
index 19f5df0b538..0ab04b0ad17 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
@@ -63,7 +63,7 @@ export default DropdownSelectBoxComponent.extend({
         content.title = I18n.t("composer.composer_actions.reply");
         break;
       case EDIT:
-        content.icon = "pencil";
+        content.icon = "pencil-alt";
         content.title = I18n.t("composer.composer_actions.edit");
         break;
       case CREATE_SHARED_DRAFT:
@@ -151,7 +151,7 @@ export default DropdownSelectBoxComponent.extend({
       items.push({
         name: I18n.t("composer.composer_actions.toggle_whisper.label"),
         description: I18n.t("composer.composer_actions.toggle_whisper.desc"),
-        icon: "eye-slash",
+        icon: "far-eye-slash",
         id: "toggle_whisper"
       });
     }
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
index 447c5e25cc0..5454e36cf00 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -19,7 +19,7 @@ export const TIMEFRAMES = [
     format: "h a",
     enabled: opts => opts.canScheduleToday,
     when: time => time.hour(18).minute(0),
-    icon: "moon-o"
+    icon: "far-moon"
   }),
   buildTimeframe({
     id: "tomorrow",
@@ -29,7 +29,7 @@ export const TIMEFRAMES = [
         .add(1, "day")
         .hour(timeOfDay)
         .minute(0),
-    icon: "sun-o"
+    icon: "far-sun"
   }),
   buildTimeframe({
     id: "later_this_week",
@@ -139,12 +139,12 @@ export const TIMEFRAMES = [
   }),
   buildTimeframe({
     id: "pick_date_and_time",
-    icon: "calendar-plus-o"
+    icon: "far-calendar-plus"
   }),
   buildTimeframe({
     id: "set_based_on_last_post",
     enabled: opts => opts.includeBasedOnLastPost,
-    icon: "clock-o"
+    icon: "far-clock"
   })
 ];
 
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
index 1e8fbc61f73..7df9d44f9cd 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
@@ -7,7 +7,7 @@
     {{i18n "wizard.uploading"}}
   {{else}}
     {{i18n "wizard.upload"}}
-    {{d-icon "picture-o"}}
+    {{d-icon "far-image"}}
   {{/if}}
 
   <input class="wizard-hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" />
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 0ac240dee62..fc0d2b9e139 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -435,7 +435,7 @@ createWidget("discourse-poll-buttons", {
           className: "btn toggle-results",
           label: "poll.hide-results.label",
           title: "poll.hide-results.title",
-          icon: "eye-slash",
+          icon: "far-eye-slash",
           disabled: hideResultsDisabled,
           action: "toggleResults"
         })
@@ -451,7 +451,7 @@ createWidget("discourse-poll-buttons", {
             className: "btn toggle-results",
             label: "poll.show-results.label",
             title: "poll.show-results.title",
-            icon: "eye",
+            icon: "far-eye",
             disabled: poll.get("voters") === 0,
             action: "toggleResults"
           })
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6
index 40fdd40a833..acf39c55ff3 100644
--- a/test/javascripts/acceptance/composer-actions-test.js.es6
+++ b/test/javascripts/acceptance/composer-actions-test.js.es6
@@ -89,7 +89,9 @@ QUnit.test("replying to post - toggle_whisper", async assert => {
   await composerActions.expand();
   await composerActions.selectRowByValue("toggle_whisper");
 
-  assert.ok(find(".composer-fields .whisper .d-icon-eye-slash").length === 1);
+  assert.ok(
+    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1
+  );
 });
 
 QUnit.test("replying to post - reply_as_new_topic", async assert => {
@@ -100,7 +102,7 @@ QUnit.test("replying to post - reply_as_new_topic", async assert => {
 
   await visit("/t/internationalization-localization/280");
 
-  await click("#topic-title .d-icon-pencil");
+  await click("#topic-title .d-icon-pencil-alt");
   await categoryChooser.expand();
   await categoryChooser.selectRowByValue(4);
   await click("#topic-title .submit-edit");
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index 4f80d96cd61..a84f85ff85f 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -384,7 +384,7 @@ QUnit.test("Composer can toggle whispers", async assert => {
   await menu.selectRowByValue("toggleWhisper");
 
   assert.ok(
-    find(".composer-fields .whisper .d-icon-eye-slash").length === 1,
+    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
     "it sets the post type to whisper"
   );
 
@@ -392,7 +392,7 @@ QUnit.test("Composer can toggle whispers", async assert => {
   await menu.selectRowByValue("toggleWhisper");
 
   assert.ok(
-    find(".composer-fields .whisper .d-icon-eye-slash").length === 0,
+    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
     "it removes the whisper mode"
   );
 
@@ -424,7 +424,7 @@ QUnit.test("Switching composer whisper state", async assert => {
   await click("#topic-footer-buttons .btn.create");
 
   assert.ok(
-    find(".composer-fields .whisper .d-icon-eye-slash").length === 0,
+    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
     "doesn’t set topic reply as whisper"
   );
 
@@ -432,7 +432,7 @@ QUnit.test("Switching composer whisper state", async assert => {
 
   assert.ok(find(".topic-post:last").hasClass("whisper"));
   assert.ok(
-    find(".composer-fields .whisper .d-icon-eye-slash").length === 1,
+    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
     "sets post reply as a whisper"
   );
 
@@ -440,7 +440,7 @@ QUnit.test("Switching composer whisper state", async assert => {
 
   assert.notOk(find(".topic-post:nth-last-child(2)").hasClass("whisper"));
   assert.ok(
-    find(".composer-fields .whisper .d-icon-eye-slash").length === 0,
+    find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
     "doesn’t set post reply as a whisper"
   );
 });
@@ -499,7 +499,7 @@ QUnit.test(
     );
 
     assert.ok(
-      find(".composer-fields .whisper .d-icon-eye-slash").length === 1,
+      find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
       "it sets the post type to whisper"
     );
 
@@ -508,7 +508,7 @@ QUnit.test(
 
     await click("#create-topic");
     assert.ok(
-      find(".composer-fields .whisper .d-icon-eye-slash").length === 0,
+      find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
       "it should reset the state of the composer's model"
     );
 
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 011d64bd75a..fc689253f1e 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -48,7 +48,7 @@ QUnit.test("Share Popup", async assert => {
 QUnit.test("Showing and hiding the edit controls", async assert => {
   await visit("/t/internationalization-localization/280");
 
-  await click("#topic-title .d-icon-pencil");
+  await click("#topic-title .d-icon-pencil-alt");
 
   assert.ok(exists("#edit-title"), "it shows the editing controls");
   assert.ok(
@@ -66,7 +66,7 @@ QUnit.test("Updating the topic title and category", async assert => {
 
   await visit("/t/internationalization-localization/280");
 
-  await click("#topic-title .d-icon-pencil");
+  await click("#topic-title .d-icon-pencil-alt");
   await fillIn("#edit-title", "this is the new title");
   await categoryChooser.expand();
   await categoryChooser.selectRowByValue(4);
@@ -185,7 +185,7 @@ QUnit.test("Visit topic routes", async assert => {
 
 QUnit.test("Updating the topic title with emojis", async assert => {
   await visit("/t/internationalization-localization/280");
-  await click("#topic-title .d-icon-pencil");
+  await click("#topic-title .d-icon-pencil-alt");
 
   await fillIn("#edit-title", "emojis title :bike: :blonde_woman:t6:");
 
diff --git a/test/javascripts/components/image-uploader-test.js.es6 b/test/javascripts/components/image-uploader-test.js.es6
index 94740b3fe71..da30f733b5b 100644
--- a/test/javascripts/components/image-uploader-test.js.es6
+++ b/test/javascripts/components/image-uploader-test.js.es6
@@ -6,13 +6,13 @@ componentTest("with image", {
 
   test(assert) {
     assert.equal(
-      this.$(".d-icon-picture-o").length,
+      this.$(".d-icon-far-image").length,
       1,
       "it displays the upload icon"
     );
 
     assert.equal(
-      this.$(".d-icon-trash-o").length,
+      this.$(".d-icon-far-trash-alt").length,
       1,
       "it displays the trash icon"
     );
@@ -24,13 +24,13 @@ componentTest("without image", {
 
   test(assert) {
     assert.equal(
-      this.$(".d-icon-picture-o").length,
+      this.$(".d-icon-far-image").length,
       1,
       "it displays the upload icon"
     );
 
     assert.equal(
-      this.$(".d-icon-trash-o").length,
+      this.$(".d-icon-far-trash-alt").length,
       0,
       "it does not display trash icon"
     );
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6
index 04e45927cbf..40aeb3fb456 100644
--- a/test/javascripts/widgets/actions-summary-test.js.es6
+++ b/test/javascripts/widgets/actions-summary-test.js.es6
@@ -80,7 +80,7 @@ widgetTest("post deleted", {
   },
   test(assert) {
     assert.ok(
-      this.$(".post-action .d-icon-trash-o").length === 1,
+      this.$(".post-action .d-icon-far-trash-alt").length === 1,
       "it has the deleted icon"
     );
     assert.ok(
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js.es6
index c618f6f32ba..b150c333554 100644
--- a/test/javascripts/widgets/poster-name-test.js.es6
+++ b/test/javascripts/widgets/poster-name-test.js.es6
@@ -39,7 +39,7 @@ widgetTest("extra classes and glyphs", {
     assert.ok(this.$("span.staff").length);
     assert.ok(this.$("span.admin").length);
     assert.ok(this.$("span.moderator").length);
-    assert.ok(this.$(".d-icon-shield").length);
+    assert.ok(this.$(".d-icon-shield-alt").length);
     assert.ok(this.$("span.new-user").length);
     assert.ok(this.$("span.fish").length);
   }