diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
index a98f8684f03..a73ddbcfb0f 100644
--- a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
@@ -7,7 +7,7 @@
 <div class="col actions">
   {{d-button icon="ellipsis-v" action=(action "toggleRequest") label="admin.web_hooks.events.request"}}
   {{d-button icon="ellipsis-v" action=(action "toggleResponse") label="admin.web_hooks.events.response"}}
-  {{d-button icon="refresh" action=(action "redeliver") label="admin.web_hooks.events.redeliver"}}
+  {{d-button icon="sync" action=(action "redeliver") label="admin.web_hooks.events.redeliver"}}
 </div>
 {{#if expandDetails}}
   <div class="details">
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index d904f7d053b..e4796c8cdcb 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -75,7 +75,7 @@
         {{#if model.remote_theme.commits_behind}}
           {{#d-button action=(action "updateToLatest") icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
         {{else}}
-          {{#d-button action=(action "checkForThemeUpdates") icon="refresh" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
+          {{#d-button action=(action "checkForThemeUpdates") icon="sync" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
         {{/if}}
 
         <span class='status-message'>
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index 901b6eb8d7a..0f0b1f9d290 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -18,7 +18,7 @@
         </div>
 
         <p class="actions">
-          {{d-button action=(action "refreshProblems") class="btn-default" icon="refresh" label="admin.dashboard.refresh_problems"}}
+          {{d-button action=(action "refreshProblems") class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
           {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
index be79a0e16a2..e1b6bd0fe83 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs
@@ -2,7 +2,7 @@
   <div class="popular-theme-name">
     {{theme.name}}
     {{#if theme.preview}}
-      <a href="{{theme.preview}}" title="Preview" target="_blank">{{d-icon "eye"}}</a>
+      <a href="{{theme.preview}}" title="Preview" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 6d7df62c725..22c356239e5 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -62,7 +62,7 @@ export const SAVE_LABELS = {
 };
 
 export const SAVE_ICONS = {
-  [EDIT]: "pencil",
+  [EDIT]: "pencil-alt",
   [EDIT_SHARED_DRAFT]: "clipboard",
   [REPLY]: "reply",
   [CREATE_TOPIC]: "plus",
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index e40a5a2abe6..8df8e1e5cdb 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -53,12 +53,12 @@
             {{#if user.ignored}}
               {{d-button class="btn-default"
                          action=(action "watchUser")
-                         icon="eye"
+                         icon="far-eye"
                          label="user.watch"}}
             {{else}}
               {{d-button class="btn-danger"
                          action=(action "ignoreUser")
-                         icon="eye-slash"
+                         icon="far-eye-slash"
                          label="user.ignore"}}
             {{/if}}
           </li>
@@ -114,7 +114,7 @@
     {{#if hasLocationOrWebsite}}
       <div class="location-and-website">
         {{#if user.location}}
-          <span class='location'>{{d-icon "map-marker"}} <span>{{user.location}}</span></span>
+          <span class='location'>{{d-icon "map-marker-alt"}} <span>{{user.location}}</span></span>
         {{/if}}
 
         {{#if user.website_name}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 6b163a76420..7b239543c43 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -8,7 +8,7 @@
     <h3>{{i18n 'user.auth_tokens.details'}}</h3>
     <ul style="list-style-type:none">
       <li>{{d-icon "far-clock"}} {{format-date model.seen_at}}</li>
-      <li>{{d-icon "map-marker"}} {{model.location}}</li>
+      <li>{{d-icon "map-marker-alt"}} {{model.location}}</li>
       <li>{{d-icon model.icon}} {{i18n "user.auth_tokens.browser_and_device" browser=model.browser device=model.device}}</li>
     </ul>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 2c5de674ddc..26713e01492 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -19,7 +19,7 @@
       {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
                  disabled=gravatarRefreshDisabled
-                 icon="refresh"
+                 icon="sync"
                  class="btn-default avatar-selector-refresh-gravatar"}}
 
       {{#if gravatarFailed}}
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 969e5262657..97444c9a250 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -132,7 +132,7 @@
     {{/if}}
 
     {{#if displayShow}}
-      {{d-button action=(action "showVersion") icon="eye" label="post.revisions.controls.show" class="btn-default" disabled=loading}}
+      {{d-button action=(action "showVersion") icon="far-eye" label="post.revisions.controls.show" class="btn-default" disabled=loading}}
     {{/if}}
 
     {{#if displayEdit}}
diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs
index 22e24e01424..a5984c1add4 100644
--- a/app/assets/javascripts/discourse/templates/queued-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs
@@ -6,6 +6,6 @@
       <p>{{i18n "queue.none"}}</p>
     {{/each}}
 
-    {{d-button action=(route-action "refresh") label="refresh" icon="refresh" disabled=model.refreshing class="btn-default" id='refresh-queued'}}
+    {{d-button action=(route-action "refresh") label="refresh" icon="sync" disabled=model.refreshing class="btn-default" id='refresh-queued'}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 0c9629ca9d7..61dd9e936d5 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -309,7 +309,7 @@
                 {{d-button action=(route-action "showLogin") class="btn-primary topic-retry" icon="user" label="log_in"}}
               {{/unless}}
             {{else}}
-              {{d-button action=(action "retryLoading") class="btn-primary topic-retry" icon="refresh" label="errors.buttons.again"}}
+              {{d-button action=(action "retryLoading") class="btn-primary topic-retry" icon="sync" label="errors.buttons.again"}}
             {{/if}}
           </div>
           {{conditional-loading-spinner condition=retrying}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 755d9090f1f..02ff00914ce 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -54,7 +54,7 @@
                   {{#if model.ignored}}
                     {{d-button class="btn-default"
                                action=(action "watchUser")
-                               icon="eye"
+                               icon="far-eye"
                                label="user.watch"}}
                   {{else}}
                     {{d-button class="btn-danger"
@@ -99,7 +99,7 @@
             {{/if}}
             {{plugin-outlet name="user-post-names" args=(hash model=model)}}
             <h3 class="location-and-website">
-            {{#if model.location}}{{d-icon "map-marker"}} {{model.location}}{{/if}}
+            {{#if model.location}}{{d-icon "map-marker-alt"}} {{model.location}}{{/if}}
             {{#if model.website_name}}
               {{d-icon "globe"}}
               {{#if linkWebsite}}
diff --git a/app/serializers/concerns/user_auth_tokens_mixin.rb b/app/serializers/concerns/user_auth_tokens_mixin.rb
index 65a7cb3f5de..4cb432d86c5 100644
--- a/app/serializers/concerns/user_auth_tokens_mixin.rb
+++ b/app/serializers/concerns/user_auth_tokens_mixin.rb
@@ -42,13 +42,13 @@ module UserAuthTokensMixin
   def icon
     case BrowserDetection.os(object.user_agent)
     when :android
-      'android'
+      'fab-android'
     when :macos, :ios
-      'apple'
+      'fab-apple'
     when :linux
-      'linux'
+      'fab-linux'
     when :windows
-      'windows'
+      'fab-windows'
     else
       'question'
     end