diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs b/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs
index 5f4d4b2e370..a6abf5a5346 100644
--- a/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-backups-actions.gjs
@@ -56,7 +56,7 @@ export default class AdminBackupsActions extends Component {
         @action={{routeAction "cancelOperation"}}
         @title="admin.backups.operations.cancel.title"
         @label="admin.backups.operations.cancel.label"
-        @icon="times"
+        @icon="xmark"
         class="admin-backups__cancel"
       />
     {{else}}
@@ -74,7 +74,7 @@ export default class AdminBackupsActions extends Component {
         @action={{routeAction "rollback"}}
         @label="admin.backups.operations.rollback.label"
         @title="admin.backups.operations.rollback.title"
-        @icon="ambulance"
+        @icon="truck-medical"
         @disabled={{this.rollbackDisabled}}
         class="admin-backups__rollback"
       />
diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
index efee39772d0..4db9c679992 100644
--- a/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.hbs
@@ -21,6 +21,6 @@
     />
     <a href {{on "click" this.edit}}>{{i18n "cancel"}}</a>
   {{else}}
-    <DButton class="btn-default" @action={{this.edit}} @icon="pencil-alt" />
+    <DButton class="btn-default" @action={{this.edit}} @icon="pencil" />
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs b/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs
index 8f0cbdae58b..1bb8ea51716 100644
--- a/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs
@@ -148,7 +148,7 @@ export default class AdminFlagItem extends Component {
             <DMenu
               @identifier="flag-menu"
               @title={{i18n "admin.config_areas.flags.more_options.title"}}
-              @icon="ellipsis-v"
+              @icon="ellipsis-vertical"
               @onRegisterApi={{this.onRegisterApi}}
             >
               <:content>
@@ -177,7 +177,7 @@ export default class AdminFlagItem extends Component {
                   <dropdown.item>
                     <DButton
                       @label="admin.config_areas.flags.delete"
-                      @icon="trash-alt"
+                      @icon="trash-can"
                       class="btn-transparent admin-flag-item__delete"
                       @action={{this.delete}}
                       @disabled={{not this.canEdit}}
diff --git a/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs b/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs
index 2d09b602f6d..cb6d81bfde9 100644
--- a/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs
@@ -182,7 +182,7 @@ export default class AdminFlagsForm extends Component {
               </checkboxGroup.Field>
             </form.CheckboxGroup>
 
-            <form.Alert @icon="info-circle">
+            <form.Alert @icon="circle-info">
               {{i18n "admin.config_areas.flags.form.alert"}}
             </form.Alert>
 
diff --git a/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs b/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs
index 284c4343cdc..37fb9365575 100644
--- a/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs
@@ -97,7 +97,7 @@ export default class AdminPluginsListItem extends Component {
               target="_blank"
             >
               {{i18n "admin.plugins.learn_more"}}
-              {{icon "external-link-alt"}}
+              {{icon "up-right-from-square"}}
             </a>
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs
index 8a88ac72e45..eb885e4ff47 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.hbs
@@ -1,7 +1,7 @@
 {{#if this.showBackupStats}}
   <div class="backups">
     <h3 class="storage-stats-title">
-      <a href={{get-url "/admin/backups"}}>{{d-icon "archive"}}
+      <a href={{get-url "/admin/backups"}}>{{d-icon "box-archive"}}
         {{i18n "admin.dashboard.backups"}}</a>
     </h3>
     <p>
diff --git a/app/assets/javascripts/admin/addon/components/admin-report.hbs b/app/assets/javascripts/admin/addon/components/admin-report.hbs
index f13e0c7d6a2..6217cd62c5d 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-report.hbs
@@ -28,7 +28,7 @@
                       @interactive={{this.model.description_link.length}}
                     >
                       <:trigger>
-                        {{d-icon "question-circle"}}
+                        {{d-icon "circle-question"}}
                       </:trigger>
                       <:content>
                         {{#if this.model.description_link}}
@@ -78,21 +78,21 @@
           {{#if this.showError}}
             {{#if this.showTimeoutError}}
               <div class="alert alert-error report-alert timeout">
-                {{d-icon "exclamation-triangle"}}
+                {{d-icon "triangle-exclamation"}}
                 <span>{{i18n "admin.dashboard.timeout_error"}}</span>
               </div>
             {{/if}}
 
             {{#if this.showExceptionError}}
               <div class="alert alert-error report-alert exception">
-                {{d-icon "exclamation-triangle"}}
+                {{d-icon "triangle-exclamation"}}
                 <span>{{i18n "admin.dashboard.exception_error"}}</span>
               </div>
             {{/if}}
 
             {{#if this.showNotFoundError}}
               <div class="alert alert-error report-alert not-found">
-                {{d-icon "exclamation-triangle"}}
+                {{d-icon "triangle-exclamation"}}
                 <span>{{i18n "admin.dashboard.not_found_error"}}</span>
               </div>
             {{/if}}
@@ -115,7 +115,7 @@
             {{else}}
               {{#if this.rateLimitationString}}
                 <div class="alert alert-error report-alert rate-limited">
-                  {{d-icon "thermometer-three-quarters"}}
+                  {{d-icon "temperature-three-quarters"}}
                   <span>{{this.rateLimitationString}}</span>
                 </div>
               {{else}}
@@ -228,7 +228,7 @@
                   <DButton
                     @action={{this.refreshReport}}
                     @label="admin.dashboard.reports.refresh_report"
-                    @icon="sync"
+                    @icon="arrows-rotate"
                     class="refresh-report-btn btn-primary"
                   />
                 </div>
diff --git a/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs b/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs
index 44fdb370813..e6d1a3b17ac 100644
--- a/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-site-settings-filter-controls.gjs
@@ -65,7 +65,7 @@ export default class AdminSiteSettingsFilterControls extends Component {
           {{#if @showMenu}}
             <DButton
               @action={{this.toggleMenu}}
-              @icon={{if this.isMenuOpen "times" "bars"}}
+              @icon={{if this.isMenuOpen "xmark" "bars"}}
               class="menu-toggle"
             />
           {{/if}}
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
index d5437664c3e..effaf57c4ec 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
@@ -10,7 +10,7 @@
             title={{this.field.title}}
             class={{if target.edited "edited" "blank"}}
           >
-            {{#if target.error}}{{d-icon "exclamation-triangle"}}{{/if}}
+            {{#if target.error}}{{d-icon "triangle-exclamation"}}{{/if}}
             {{#if target.icon}}{{d-icon target.icon}}{{/if}}
             {{i18n (concat "admin.customize.theme." target.name)}}
           </LinkTo>
@@ -30,9 +30,7 @@
             }}
             class="no-text"
           >
-            {{d-icon
-              (if this.showAdvanced "angle-double-left" "angle-double-right")
-            }}
+            {{d-icon (if this.showAdvanced "angles-left" "angles-right")}}
           </a>
         </li>
       {{/if}}
@@ -66,7 +64,7 @@
             title={{field.title}}
             class={{if field.edited "edited" "blank"}}
           >
-            {{#if field.error}}{{d-icon "exclamation-triangle"}}{{/if}}
+            {{#if field.error}}{{d-icon "triangle-exclamation"}}{{/if}}
             {{#if field.icon}}{{d-icon field.icon}}{{/if}}
             {{field.translatedName}}
           </LinkTo>
@@ -89,7 +87,7 @@
             />
             <DButton
               @action={{this.cancelAddField}}
-              @icon="times"
+              @icon="xmark"
               class="cancel"
             />
           {{else}}
diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
index 82e174efe77..a2417599637 100644
--- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.hbs
@@ -114,7 +114,7 @@
       />
       <DButton
         @action={{this.cancel}}
-        @icon="times"
+        @icon="xmark"
         @label="admin.user_fields.cancel"
         class="btn-danger cancel"
       />
@@ -132,13 +132,13 @@
       <div class="form-element controls">
         <DButton
           @action={{this.edit}}
-          @icon="pencil-alt"
+          @icon="pencil"
           @label="admin.user_fields.edit"
           class="btn-default edit"
         />
         <DButton
           @action={{fn this.destroyAction this.userField}}
-          @icon="far-trash-alt"
+          @icon="trash-can"
           @label="admin.user_fields.delete"
           class="btn-danger cancel"
         />
diff --git a/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs b/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs
index f60982e7700..1ebe82e9b20 100644
--- a/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-watched-word.gjs
@@ -30,7 +30,7 @@ export default class AdminWatchedWord extends Component {
     <div class="watched-word">
       <DButton
         @action={{this.deleteWord}}
-        @icon="times"
+        @icon="xmark"
         class="btn-transparent delete-word-record"
       />
 
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs b/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs
index e9bdf69b623..d34b737c896 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs
+++ b/app/assets/javascripts/admin/addon/components/dashboard-period-selector.gjs
@@ -30,7 +30,7 @@ export default class DashboardPeriodSelector extends Component {
         @fullDay={{false}}
       />
       <DButton
-        @icon="cog"
+        @icon="gear"
         @action={{this.openCustomDateRangeModal}}
         @title="admin.dashboard.custom_date_range"
         class="custom-date-range-button"
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs b/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
index 05cf0115d4b..10bbf1ed75f 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/addon/components/dashboard-problems.hbs
@@ -20,7 +20,7 @@
                     problem.priority
                   }}
                 >
-                  {{d-icon "exclamation-triangle"}}
+                  {{d-icon "triangle-exclamation"}}
                   {{html-safe problem.message}}
                 </li>
               {{/each}}
@@ -45,7 +45,7 @@
         <p class="actions">
           <DButton
             @action={{this.refreshProblems}}
-            @icon="sync"
+            @icon="arrows-rotate"
             @label="admin.dashboard.refresh_problems"
             class="btn-default"
           />
diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
index f0a7d06f687..eb52efd31e7 100644
--- a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
@@ -53,7 +53,7 @@
       class="btn-primary"
     />
     <DButton
-      @icon="times"
+      @icon="xmark"
       @action={{this.cancel}}
       @disabled={{this.host.isSaving}}
       class="btn-danger"
@@ -81,7 +81,7 @@
     {{this.user}}
   </td>
   <td class="controls">
-    <DButton @icon="pencil-alt" @action={{this.edit}} />
-    <DButton @icon="far-trash-alt" @action={{this.delete}} class="btn-danger" />
+    <DButton @icon="pencil" @action={{this.edit}} />
+    <DButton @icon="trash-can" @action={{this.delete}} class="btn-danger" />
   </td>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs b/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
index 1be68d11178..8562b1cd92d 100644
--- a/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.hbs
@@ -4,7 +4,7 @@
       <li class="value" data-index={{index}}>
         <DButton
           @action={{fn this.removeValue data}}
-          @icon="times"
+          @icon="xmark"
           @disabled={{not data.isEditable}}
           class="remove-value-btn btn-small"
         />
diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.hbs b/app/assets/javascripts/admin/addon/components/form-template/form.hbs
index d9b719cd823..83763e7a8aa 100644
--- a/app/assets/javascripts/admin/addon/components/form-template/form.hbs
+++ b/app/assets/javascripts/admin/addon/components/form-template/form.hbs
@@ -25,7 +25,7 @@
       {{/each}}
       <DButton
         @label="admin.form_templates.validations_modal.button_title"
-        @icon="check-circle"
+        @icon="circle-check"
         @action={{this.showValidationOptionsModal}}
         class="btn-flat btn-icon-text form-templates__validations-modal-button"
       />
@@ -58,14 +58,14 @@
 
     <DButton
       @label="admin.form_templates.new_template_form.cancel"
-      @icon="times"
+      @icon="xmark"
       @action={{this.onCancel}}
     />
 
     {{#if this.isEditing}}
       <DButton
         @label="admin.form_templates.view_template.delete"
-        @icon="trash-alt"
+        @icon="trash-can"
         @action={{this.onDelete}}
         class="btn-danger"
       />
diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.js b/app/assets/javascripts/admin/addon/components/form-template/form.js
index 49b7553c353..9f8d36d8efe 100644
--- a/app/assets/javascripts/admin/addon/components/form-template/form.js
+++ b/app/assets/javascripts/admin/addon/components/form-template/form.js
@@ -22,7 +22,7 @@ export default class FormTemplateForm extends Component {
   quickInsertFields = [
     {
       type: "checkbox",
-      icon: "check-square",
+      icon: "square-check",
     },
     {
       type: "input",
@@ -34,11 +34,11 @@ export default class FormTemplateForm extends Component {
     },
     {
       type: "dropdown",
-      icon: "chevron-circle-down",
+      icon: "circle-chevron-down",
     },
     {
       type: "upload",
-      icon: "cloud-upload-alt",
+      icon: "cloud-arrow-up",
     },
     {
       type: "multiselect",
diff --git a/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
index 1ffbcfd6a0d..a6f2e58b804 100644
--- a/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
+++ b/app/assets/javascripts/admin/addon/components/form-template/row-item.hbs
@@ -14,13 +14,13 @@
     />
     <DButton
       @title="admin.form_templates.list_table.actions.edit"
-      @icon="pencil-alt"
+      @icon="pencil"
       @action={{this.editTemplate}}
       class="btn-edit-template"
     />
     <DButton
       @title="admin.form_templates.list_table.actions.delete"
-      @icon="far-trash-alt"
+      @icon="trash-can"
       @action={{this.deleteTemplate}}
       class="btn-danger btn-delete-template"
     />
diff --git a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
index 9e2d6948008..4b9108c896e 100644
--- a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
+++ b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.hbs
@@ -10,7 +10,7 @@
   />
   <DButton
     @action={{this.cancel}}
-    @icon="times"
+    @icon="xmark"
     class="btn-small cancel-edit"
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/components/ip-lookup.hbs
index 1097e54a84a..bcae14a51e8 100644
--- a/app/assets/javascripts/admin/addon/components/ip-lookup.hbs
+++ b/app/assets/javascripts/admin/addon/components/ip-lookup.hbs
@@ -9,7 +9,7 @@
 {{#if this.show}}
   <div class="location-box">
     <a href class="close pull-right" {{on "click" this.hide}}>{{d-icon
-        "times"
+        "xmark"
       }}</a>
     {{#if this.copied}}
       <DButton
@@ -58,7 +58,7 @@
         {{#if this.other_accounts.length}}
           <DButton
             @action={{this.deleteOtherAccounts}}
-            @icon="exclamation-triangle"
+            @icon="triangle-exclamation"
             @translatedLabel={{i18n
               "ip_lookup.delete_other_accounts"
               count=this.otherAccountsToDelete
diff --git a/app/assets/javascripts/admin/addon/components/modal/badge-preview.hbs b/app/assets/javascripts/admin/addon/components/modal/badge-preview.hbs
index e3b195b7aba..c220b2152b4 100644
--- a/app/assets/javascripts/admin/addon/components/modal/badge-preview.hbs
+++ b/app/assets/javascripts/admin/addon/components/modal/badge-preview.hbs
@@ -25,7 +25,7 @@
       {{#if this.countWarning}}
         <div class="count-warning">
           <p class="heading">
-            {{d-icon "exclamation-triangle"}}
+            {{d-icon "triangle-exclamation"}}
             {{i18n "admin.badges.preview.bad_count_warning.header"}}
           </p>
           <p class="body">
diff --git a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs
index 902358aeaa6..8376d1a84b5 100644
--- a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs
+++ b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.hbs
@@ -16,7 +16,7 @@
     <DButton
       @action={{this.updateDateRange}}
       @label="admin.dashboard.reports.refresh_report"
-      @icon="sync"
+      @icon="arrows-rotate"
     />
   </:footer>
 </DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs
index 8d8680d9b62..b74516d3637 100644
--- a/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs
+++ b/app/assets/javascripts/admin/addon/components/modal/delete-posts-confirmation.hbs
@@ -21,7 +21,7 @@
     <DButton
       class="btn-danger"
       @action={{@model.deleteAllPosts}}
-      @icon="trash-alt"
+      @icon="trash-can"
       @disabled={{this.deleteDisabled}}
       @translatedLabel={{i18n
         "admin.user.delete_posts.confirmation.delete"
diff --git a/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.hbs b/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.hbs
index 72ef5c73a83..74f9e9789b2 100644
--- a/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.hbs
+++ b/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.hbs
@@ -22,7 +22,7 @@
                 <DButton
                   @action={{fn (mut wc.editing) true}}
                   @disabled={{wc.system}}
-                  @icon="pencil-alt"
+                  @icon="pencil"
                 />
               {{/if}}
               <DButton @action={{fn this.up wc}} @icon="chevron-up" />
@@ -30,7 +30,7 @@
               <DButton
                 @action={{fn this.delete wc}}
                 @disabled={{wc.system}}
-                @icon="times"
+                @icon="xmark"
               />
             </div>
           </li>
diff --git a/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs b/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs
index a43371867b5..dd37f653309 100644
--- a/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs
+++ b/app/assets/javascripts/admin/addon/components/modal/merge-users-confirmation.hbs
@@ -21,7 +21,7 @@
     <DButton
       class="btn-danger"
       @action={{fn @model.merge @model.targetUsername}}
-      @icon="trash-alt"
+      @icon="trash-can"
       @disabled={{this.mergeDisabled}}
       @translatedLabel={{i18n
         "admin.user.merge.confirmation.transfer_and_delete"
diff --git a/app/assets/javascripts/admin/addon/components/modal/merge-users-prompt.hbs b/app/assets/javascripts/admin/addon/components/modal/merge-users-prompt.hbs
index b27a379fbb3..3c738c58361 100644
--- a/app/assets/javascripts/admin/addon/components/modal/merge-users-prompt.hbs
+++ b/app/assets/javascripts/admin/addon/components/modal/merge-users-prompt.hbs
@@ -24,7 +24,7 @@
     <DButton
       class="btn-primary"
       @action={{fn @model.showMergeConfirmation (get this.targetUsername "0")}}
-      @icon="trash-alt"
+      @icon="trash-can"
       @disabled={{this.mergeDisabled}}
       @translatedLabel={{i18n
         "admin.user.merge.confirmation.transfer_and_delete"
diff --git a/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.hbs
index b802fca84c4..7bcd7026fe2 100644
--- a/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.hbs
@@ -9,7 +9,7 @@
         <a href class="selectable-avatar" {{on "click" (fn this.remove image)}}>
           {{bound-avatar-template image "huge"}}
           <span class="selectable-avatar__remove">{{d-icon
-              "times-circle"
+              "circle-xmark"
             }}</span>
         </a>
       {{else}}
diff --git a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs
index a0fbfb4a666..0d769ac4b73 100644
--- a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs
+++ b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs
@@ -308,7 +308,7 @@ export default class SchemaThemeSettingNewEditor extends Component {
           {{#if (gt this.fields.length 0)}}
             <DButton
               @action={{this.removeItem}}
-              @icon="trash-alt"
+              @icon="trash-can"
               class="btn-danger schema-theme-setting-editor__remove-btn"
             />
           {{/if}}
diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.hbs b/app/assets/javascripts/admin/addon/components/secret-value-list.hbs
index 9203ebc14dd..544d51ab89f 100644
--- a/app/assets/javascripts/admin/addon/components/secret-value-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/secret-value-list.hbs
@@ -4,7 +4,7 @@
       <div class="value" data-index={{index}}>
         <DButton
           @action={{fn this.removeValue value}}
-          @icon="times"
+          @icon="xmark"
           class="remove-value-btn btn-small"
         />
         <Input
diff --git a/app/assets/javascripts/admin/addon/components/setting-validation-message.hbs b/app/assets/javascripts/admin/addon/components/setting-validation-message.hbs
index 9bb9dbbce6d..eef1454b751 100644
--- a/app/assets/javascripts/admin/addon/components/setting-validation-message.hbs
+++ b/app/assets/javascripts/admin/addon/components/setting-validation-message.hbs
@@ -1,4 +1,4 @@
 <div class="validation-error {{unless this.message 'hidden'}}">
-  {{d-icon "times"}}
+  {{d-icon "xmark"}}
   {{this.message}}
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/simple-list.hbs b/app/assets/javascripts/admin/addon/components/simple-list.hbs
index 277d8b5e5b6..958d11ea7df 100644
--- a/app/assets/javascripts/admin/addon/components/simple-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/simple-list.hbs
@@ -4,7 +4,7 @@
       <div data-index={{index}} class="value">
         <DButton
           @action={{fn this.removeValue value}}
-          @icon="times"
+          @icon="xmark"
           class="remove-value-btn btn-small"
         />
 
diff --git a/app/assets/javascripts/admin/addon/components/site-setting.hbs b/app/assets/javascripts/admin/addon/components/site-setting.hbs
index c8047733e6b..67f37c2325a 100644
--- a/app/assets/javascripts/admin/addon/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/addon/components/site-setting.hbs
@@ -9,7 +9,7 @@
         title={{i18n "admin.settings.history"}}
       >
         <span class="history-icon">
-          {{d-icon "history"}}
+          {{d-icon "clock-rotate-left"}}
         </span>
       </LinkTo>
     {{/if}}
@@ -62,7 +62,7 @@
     />
     <DButton
       @action={{this.cancel}}
-      @icon="times"
+      @icon="xmark"
       class="cancel setting-controls__cancel"
     />
   </div>
@@ -78,7 +78,7 @@
   <DButton
     class="btn-default undo setting-controls__undo"
     @action={{this.resetDefault}}
-    @icon="undo"
+    @icon="arrow-rotate-left"
     @label="admin.settings.reset"
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs b/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs
index 3a74647fdca..f35651f8b74 100644
--- a/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/theme-settings-editor.hbs
@@ -8,7 +8,7 @@
 
     {{#each this.errors as |error|}}
       <div class="validation-error">
-        {{d-icon "times"}}
+        {{d-icon "xmark"}}
         <b>{{error.setting}}</b>:
         {{error.errorMessage}}
       </div>
diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs
index eca7738d754..f41ab0698a5 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs
@@ -117,14 +117,14 @@ export default class ThemesListItem extends Component {
               {{/if}}
               {{#if @theme.isPendingUpdates}}
                 {{icon
-                  "sync"
+                  "arrows-rotate"
                   title="admin.customize.theme.updates_available_tooltip"
                   class="light-grey-icon"
                 }}
               {{/if}}
               {{#if @theme.isBroken}}
                 {{icon
-                  "exclamation-circle"
+                  "circle-exclamation"
                   class="broken-indicator"
                   title="admin.customize.theme.broken_theme_tooltip"
                 }}
diff --git a/app/assets/javascripts/admin/addon/components/themes-list.hbs b/app/assets/javascripts/admin/addon/components/themes-list.hbs
index 4792658a8ec..20a706d651a 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/themes-list.hbs
@@ -25,7 +25,7 @@
       @type="search"
       @value={{mut this.searchTerm}}
     />
-    {{d-icon "search"}}
+    {{d-icon "magnifying-glass"}}
   </div>
   <div class="themes-list-filter">
     <div class="themes-list-filter__label">
@@ -101,7 +101,7 @@
                   @action={{this.deleteConfirmation}}
                   @disabled={{eq this.selectedCount 0}}
                 >
-                  {{d-icon "trash-alt"}}
+                  {{d-icon "trash-can"}}
                   Delete
                 </DButton>
               {{/if}}
diff --git a/app/assets/javascripts/admin/addon/components/value-list.hbs b/app/assets/javascripts/admin/addon/components/value-list.hbs
index 8141649028e..45fa5a6d461 100644
--- a/app/assets/javascripts/admin/addon/components/value-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/value-list.hbs
@@ -4,7 +4,7 @@
       <div data-index={{index}} class="value">
         <DButton
           @action={{fn this.removeValue value}}
-          @icon="times"
+          @icon="xmark"
           class="remove-value-btn btn-small"
         />
 
diff --git a/app/assets/javascripts/admin/addon/components/version-checks.hbs b/app/assets/javascripts/admin/addon/components/version-checks.hbs
index 20fac751b69..2e7ba134339 100644
--- a/app/assets/javascripts/admin/addon/components/version-checks.hbs
+++ b/app/assets/javascripts/admin/addon/components/version-checks.hbs
@@ -41,7 +41,7 @@
     <div class="version-status">
       <div class="face">
         <span class="icon critical-updates-available">
-          {{d-icon "far-frown"}}
+          {{d-icon "far-face-frown"}}
         </span>
       </div>
       <div class="version-notes">
@@ -65,11 +65,11 @@
       <div class="face">
         {{#if this.versionCheck.version_check_pending}}
           <span class="icon up-to-date">
-            {{d-icon "far-smile"}}
+            {{d-icon "far-face-smile"}}
           </span>
         {{else}}
           <span class="icon critical-updates-available">
-            {{d-icon "far-frown"}}
+            {{d-icon "far-face-frown"}}
           </span>
         {{/if}}
       </div>
@@ -96,7 +96,7 @@
       <div class="face">
         {{#if this.versionCheck.upToDate}}
           <span class="icon up-to-date">
-            {{d-icon "far-smile"}}
+            {{d-icon "far-face-smile"}}
           </span>
         {{else}}
           <span
@@ -110,7 +110,7 @@
             {{#if this.versionCheck.behindByOneVersion}}
               {{d-icon "far-meh"}}
             {{else}}
-              {{d-icon "far-frown"}}
+              {{d-icon "far-face-frown"}}
             {{/if}}
           </span>
         {{/if}}
diff --git a/app/assets/javascripts/admin/addon/components/webhook-event.hbs b/app/assets/javascripts/admin/addon/components/webhook-event.hbs
index adde109518a..55cb960aad5 100644
--- a/app/assets/javascripts/admin/addon/components/webhook-event.hbs
+++ b/app/assets/javascripts/admin/addon/components/webhook-event.hbs
@@ -1,7 +1,7 @@
 <li>
   <div class="col first status">
     {{#if @event.redelivering}}
-      {{d-icon "sync"}}
+      {{d-icon "arrows-rotate"}}
     {{else}}
       <span class={{this.statusColorClasses}}>{{@event.status}}</span>
     {{/if}}
@@ -25,7 +25,7 @@
       @label="admin.web_hooks.events.response"
     />
     <DButton
-      @icon="sync"
+      @icon="arrows-rotate"
       @action={{this.redeliver}}
       @label="admin.web_hooks.events.redeliver"
     />
diff --git a/app/assets/javascripts/admin/addon/components/webhook-event.js b/app/assets/javascripts/admin/addon/components/webhook-event.js
index 036b38a8b72..ca16cbf3853 100644
--- a/app/assets/javascripts/admin/addon/components/webhook-event.js
+++ b/app/assets/javascripts/admin/addon/components/webhook-event.js
@@ -42,14 +42,14 @@ export default class WebhookEvent extends Component {
 
   get expandRequestIcon() {
     return this.expandDetails === this.expandDetailsRequestKey
-      ? "ellipsis-h"
-      : "ellipsis-v";
+      ? "ellipsis"
+      : "ellipsis-vertical";
   }
 
   get expandResponseIcon() {
     return this.expandDetails === this.expandDetailsResponseKey
-      ? "ellipsis-h"
-      : "ellipsis-v";
+      ? "ellipsis"
+      : "ellipsis-vertical";
   }
 
   @action
diff --git a/app/assets/javascripts/admin/addon/components/webhook-events.hbs b/app/assets/javascripts/admin/addon/components/webhook-events.hbs
index a6a0f5beafb..46b27bcef8e 100644
--- a/app/assets/javascripts/admin/addon/components/webhook-events.hbs
+++ b/app/assets/javascripts/admin/addon/components/webhook-events.hbs
@@ -14,7 +14,7 @@
     />
 
     <DButton
-      @icon="sync"
+      @icon="arrows-rotate"
       @label="admin.web_hooks.events.redeliver_failed"
       @action={{this.redeliverFailed}}
       @disabled={{not this.redeliverEnabled}}
diff --git a/app/assets/javascripts/admin/addon/components/webhook-status.gjs b/app/assets/javascripts/admin/addon/components/webhook-status.gjs
index 078aa8d9e6d..1fc15e29fb4 100644
--- a/app/assets/javascripts/admin/addon/components/webhook-status.gjs
+++ b/app/assets/javascripts/admin/addon/components/webhook-status.gjs
@@ -3,7 +3,7 @@ import icon from "discourse-common/helpers/d-icon";
 import I18n from "discourse-i18n";
 
 export default class WebhookStatus extends Component {
-  iconNames = ["far-circle", "times-circle", "circle", "circle"];
+  iconNames = ["far-circle", "circle-xmark", "circle", "circle"];
   iconClasses = ["text-muted", "text-danger", "text-successful", "text-muted"];
 
   get status() {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
index 3f424b185da..b3133a9f053 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
@@ -350,7 +350,7 @@ export default class AdminUserIndexController extends Controller.extend(
       class: "delete-user-modal",
       buttons: [
         {
-          icon: "exclamation-triangle",
+          icon: "triangle-exclamation",
           label: I18n.t("admin.user.anonymize_yes"),
           class: "btn-danger",
           action: () => performAnonymize(),
@@ -425,7 +425,7 @@ export default class AdminUserIndexController extends Controller.extend(
           },
         },
         {
-          icon: "exclamation-triangle",
+          icon: "triangle-exclamation",
           label: I18n.t("admin.user.delete_and_block"),
           class: "btn-danger",
           action: () => {
diff --git a/app/assets/javascripts/admin/addon/helpers/check-icon.js b/app/assets/javascripts/admin/addon/helpers/check-icon.js
index 3acc6ecf568..7b2c29d984b 100644
--- a/app/assets/javascripts/admin/addon/helpers/check-icon.js
+++ b/app/assets/javascripts/admin/addon/helpers/check-icon.js
@@ -5,6 +5,6 @@ import { renderIcon } from "discourse-common/lib/icon-library";
 registerRawHelper("check-icon", checkIcon);
 
 export default function checkIcon(value) {
-  let icon = value ? "check" : "times";
+  let icon = value ? "check" : "xmark";
   return htmlSafe(renderIcon("string", icon));
 }
diff --git a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
index 7fc641b851e..ce0142d1471 100644
--- a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
+++ b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js
@@ -11,7 +11,7 @@ export default class DispositionIcon extends Helper {
     let title = "admin.flags.dispositions." + disposition;
     switch (disposition) {
       case "deferred": {
-        icon = "external-link-alt";
+        icon = "up-right-from-square";
         break;
       }
       case "agreed": {
diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js
index a55010df72b..8fa9c076c00 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-component.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js
@@ -199,7 +199,7 @@ export default Mixin.create({
           });
         },
         label: "admin.site_settings.json_schema.edit",
-        icon: "pencil-alt",
+        icon: "pencil",
       };
     } else if (setting.objects_schema) {
       return {
@@ -210,7 +210,7 @@ export default Mixin.create({
           );
         },
         label: "admin.customize.theme.edit_objects_theme_setting",
-        icon: "pencil-alt",
+        icon: "pencil",
       };
     }
   }),
diff --git a/app/assets/javascripts/admin/addon/models/report.js b/app/assets/javascripts/admin/addon/models/report.js
index 09eb1a132b0..f05a620ae52 100644
--- a/app/assets/javascripts/admin/addon/models/report.js
+++ b/app/assets/javascripts/admin/addon/models/report.js
@@ -692,9 +692,9 @@ export default class Report extends EmberObject {
       case "trending-down":
         return higherIsBetter ? "angle-down" : "angle-up";
       case "high-trending-up":
-        return higherIsBetter ? "angle-double-up" : "angle-double-down";
+        return higherIsBetter ? "angles-up" : "angles-down";
       case "high-trending-down":
-        return higherIsBetter ? "angle-double-down" : "angle-double-up";
+        return higherIsBetter ? "angles-down" : "angles-up";
       default:
         return "minus";
     }
diff --git a/app/assets/javascripts/admin/addon/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js
index af01ff1681d..ced9cce4fb8 100644
--- a/app/assets/javascripts/admin/addon/models/theme.js
+++ b/app/assets/javascripts/admin/addon/models/theme.js
@@ -37,8 +37,8 @@ class Theme extends RestModel {
     return [
       { id: 0, name: "common" },
       { id: 1, name: "desktop", icon: "desktop" },
-      { id: 2, name: "mobile", icon: "mobile-alt" },
-      { id: 3, name: "settings", icon: "cog", advanced: true },
+      { id: 2, name: "mobile", icon: "mobile-screen-button" },
+      { id: 3, name: "settings", icon: "gear", advanced: true },
       {
         id: 4,
         name: "translations",
@@ -49,7 +49,7 @@ class Theme extends RestModel {
       {
         id: 5,
         name: "extra_scss",
-        icon: "paint-brush",
+        icon: "paintbrush",
         advanced: true,
         customNames: true,
       },
@@ -124,7 +124,7 @@ class Theme extends RestModel {
         }
 
         if (fieldName.indexOf("_tag") > 0) {
-          field.icon = "far-file-alt";
+          field.icon = "far-file-lines";
         }
 
         return field;
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js
index ffbdb0d28de..cb8dbd620bb 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js
@@ -15,7 +15,7 @@ const externalResources = [
   {
     key: "admin.customize.theme.browse_themes",
     link: "https://meta.discourse.org/c/theme",
-    icon: "paint-brush",
+    icon: "paintbrush",
   },
 ];
 
diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js
index aaccbaae3ed..4710e500755 100644
--- a/app/assets/javascripts/admin/addon/services/admin-tools.js
+++ b/app/assets/javascripts/admin/addon/services/admin-tools.js
@@ -90,7 +90,7 @@ export default class AdminToolsService extends Service {
           message,
           class: "flagging-delete-spammer",
           confirmButtonLabel: "flagging.yes_delete_spammer",
-          confirmButtonIcon: "exclamation-triangle",
+          confirmButtonIcon: "triangle-exclamation",
           didConfirm: () => {
             return ajax(`/admin/users/${userId}.json`, {
               type: "DELETE",
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges.hbs
index 61c5ae3c419..0183cb413bd 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges.hbs
@@ -31,7 +31,7 @@
         @action={{routeAction "editGroupings"}}
         @title="admin.badges.group_settings"
         @label="admin.badges.group_settings"
-        @icon="cog"
+        @icon="gear"
         class="edit-groupings-btn"
       />
     </:actions>
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs
index bbf00f4d883..b53e581efd3 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/award.hbs
@@ -48,7 +48,7 @@
         class="btn-primary"
       />
       <LinkTo @route="adminBadges.index" class="btn btn-normal">
-        {{d-icon "times"}}
+        {{d-icon "xmark"}}
         <span>{{i18n "cancel"}}</span>
       </LinkTo>
     </form>
@@ -60,14 +60,14 @@
         {{#if this.success}}
           {{d-icon "check" class="bulk-award-status-icon success"}}
         {{else}}
-          {{d-icon "times" class="bulk-award-status-icon failure"}}
+          {{d-icon "xmark" class="bulk-award-status-icon failure"}}
         {{/if}}
         {{this.resultsMessage}}
       </p>
       {{#if this.unmatchedEntries.length}}
         <p>
           {{d-icon
-            "exclamation-triangle"
+            "triangle-exclamation"
             class="bulk-award-status-icon failure"
           }}
           <span>
diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
index 553b604f560..67735c6bf64 100644
--- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs
@@ -33,7 +33,7 @@
         @route="adminSiteText"
         @query={{hash q=(concat this.textCustomizationPrefix "name")}}
       >
-        {{d-icon "pencil-alt"}}
+        {{d-icon "pencil"}}
       </LinkTo>
     </form.Container>
   {{else}}
@@ -116,7 +116,7 @@
           @route="adminSiteText"
           @query={{hash q=(concat this.textCustomizationPrefix "description")}}
         >
-          {{d-icon "pencil-alt"}}
+          {{d-icon "pencil"}}
         </LinkTo>
       </form.Container>
     {{else}}
@@ -145,7 +145,7 @@
             q=(concat this.textCustomizationPrefix "long_description")
           }}
         >
-          {{d-icon "pencil-alt"}}
+          {{d-icon "pencil"}}
         </LinkTo>
       </form.Container>
     {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
index 3611a65fd05..5845aab6135 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
@@ -20,7 +20,7 @@
         {{#each this.model as |k|}}
           <tr class={{if k.revoked_at "revoked"}}>
             <td class="key">
-              {{#if k.revoked_at}}{{d-icon "times-circle"}}{{/if}}
+              {{#if k.revoked_at}}{{d-icon "circle-xmark"}}{{/if}}
               {{k.truncatedKey}}
             </td>
             <td class="key-description">
@@ -57,13 +57,13 @@
               {{#if k.revoked_at}}
                 <DButton
                   @action={{fn this.undoRevokeKey k}}
-                  @icon="undo"
+                  @icon="arrow-rotate-left"
                   @title="admin.api.undo_revoke"
                 />
               {{else}}
                 <DButton
                   @action={{fn this.revokeKey k}}
-                  @icon="times"
+                  @icon="xmark"
                   @title="admin.api.revoke"
                   class="btn-danger"
                 />
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
index 4e0fc952c6c..f5176a87d01 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
@@ -89,7 +89,7 @@
                 <td>
                   <div class="scope-name">{{act.name}}</div>
                   <DTooltip
-                    @icon="question-circle"
+                    @icon="circle-question"
                     @content={{i18n
                       (concat
                         "admin.api.scopes.descriptions." resource "." act.key
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
index d0a21cd7aa6..342e8f1d729 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
@@ -5,7 +5,7 @@
 
 <div class="api-key api-key-show">
   <AdminFormRow @label="admin.api.key">
-    {{#if this.model.revoked_at}}{{d-icon "times-circle"}}{{/if}}
+    {{#if this.model.revoked_at}}{{d-icon "circle-xmark"}}{{/if}}
     {{this.model.truncatedKey}}
   </AdminFormRow>
 
@@ -31,13 +31,13 @@
         <DButton @action={{this.saveDescription}} @icon="check" class="ok" />
         <DButton
           @action={{this.editDescription}}
-          @icon="times"
+          @icon="xmark"
           class="cancel"
         />
       {{else}}
         <DButton
           @action={{this.editDescription}}
-          @icon="pencil-alt"
+          @icon="pencil"
           class="btn-default"
         />
       {{/if}}
@@ -81,19 +81,19 @@
       {{#if this.model.revoked_at}}
         <DButton
           @action={{fn this.undoRevokeKey this.model}}
-          @icon="undo"
+          @icon="arrow-rotate-left"
           @label="admin.api.undo_revoke"
         />
         <DButton
           @action={{fn this.deleteKey this.model}}
-          @icon="trash-alt"
+          @icon="trash-can"
           @label="admin.api.delete"
           class="btn-danger"
         />
       {{else}}
         <DButton
           @action={{fn this.revokeKey this.model}}
-          @icon="times"
+          @icon="xmark"
           @label="admin.api.revoke"
           class="btn-danger"
         />
@@ -120,7 +120,7 @@
             <td>
               {{scope.action}}
               <DTooltip
-                @icon="question-circle"
+                @icon="circle-question"
                 @content={{i18n
                   (concat
                     "admin.api.scopes.descriptions."
diff --git a/app/assets/javascripts/admin/addon/templates/backups-index.hbs b/app/assets/javascripts/admin/addon/templates/backups-index.hbs
index 2d67b74d325..e0843ad5ba8 100644
--- a/app/assets/javascripts/admin/addon/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/backups-index.hbs
@@ -13,7 +13,7 @@
 
 {{#if this.status.restoreDisabled}}
   <div class="backup-message alert alert-info">
-    {{dIcon "info-circle"}}
+    {{dIcon "circle-info"}}
     {{html-safe
       (i18n
         "admin.backups.operations.restore.is_disabled"
@@ -46,14 +46,14 @@
           <DMenu
             @identifier="backup-item-menu"
             @title={{i18n "more_options"}}
-            @icon="ellipsis-v"
+            @icon="ellipsis-vertical"
             class="btn-small"
           >
             <:content>
               <DropdownMenu as |dropdown|>
                 <dropdown.item>
                   <DButton
-                    @icon="far-trash-alt"
+                    @icon="trash-can"
                     @action={{fn (route-action "destroyBackup") backup}}
                     @disabled={{this.status.isOperationRunning}}
                     @title={{this.deleteTitle}}
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
index 974d34d6289..16b570e1d98 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
@@ -39,7 +39,7 @@
       {{else}}
         <DButton
           @action={{this.destroy}}
-          @icon="far-trash-alt"
+          @icon="trash-can"
           @label="admin.customize.delete"
           class="btn-danger"
         />
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
index e1687c926c8..f84a8f365ac 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
@@ -10,7 +10,7 @@
             @model={{scheme}}
             @replace={{true}}
           >
-            {{d-icon "paint-brush"}}
+            {{d-icon "paintbrush"}}
             {{scheme.description}}
           </LinkTo>
         </li>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
index 433c47f3cee..2311eead180 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
@@ -15,7 +15,7 @@
   >
     <DButton
       @disabled={{this.resetDisabled}}
-      @icon="undo"
+      @icon="arrow-rotate-left"
       @action={{this.reset}}
       @label="admin.settings.reset"
       class="btn-default"
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
index dd9a69cb199..0582bf499fa 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
@@ -20,14 +20,14 @@
         />
         <DButton
           @action={{this.cancelEditingName}}
-          @icon="times"
+          @icon="xmark"
           class="btn-small cancel-edit"
         />
       {{else}}
         <span>{{this.model.name}}</span>
         <DButton
           @action={{this.startEditingName}}
-          @icon="pencil-alt"
+          @icon="pencil"
           class="btn-small"
         />
       {{/if}}
@@ -59,7 +59,7 @@
 
         {{#if this.showRemoteError}}
           <div class="error-message">
-            {{d-icon "exclamation-triangle"}}
+            {{d-icon "triangle-exclamation"}}
             {{i18n "admin.customize.theme.repo_unreachable"}}
           </div>
           <div class="raw-error">
@@ -76,7 +76,7 @@
         <DButton
           @action={{this.destroyTheme}}
           @label="admin.customize.delete"
-          @icon="trash-alt"
+          @icon="trash-can"
           class="btn-danger"
         />
 
@@ -185,7 +185,7 @@
 
               {{#if this.showRemoteError}}
                 <div class="error-message">
-                  {{d-icon "exclamation-triangle"}}
+                  {{d-icon "triangle-exclamation"}}
                   {{i18n "admin.customize.theme.repo_unreachable"}}
                 </div>
                 <div class="raw-error">
@@ -203,7 +203,7 @@
               {{else}}
                 <DButton
                   @action={{this.checkForThemeUpdates}}
-                  @icon="sync"
+                  @icon="arrows-rotate"
                   @label="admin.customize.theme.check_for_updates"
                   class="btn-default"
                 />
@@ -240,7 +240,7 @@
               </span>
             {{else}}
               <span class="status-message">
-                {{d-icon "info-circle"}}
+                {{d-icon "circle-info"}}
                 {{i18n "admin.customize.theme.imported_from_archive"}}
               </span>
             {{/if}}
@@ -296,7 +296,7 @@
                 <ColorPalettes
                   @content={{this.colorSchemes}}
                   @value={{this.colorSchemeId}}
-                  @icon="paint-brush"
+                  @icon="paintbrush"
                   @options={{hash filterable=true}}
                 />
                 {{#if this.colorSchemeId}}
@@ -322,7 +322,7 @@
                 />
                 <DButton
                   @action={{this.cancelChangeScheme}}
-                  @icon="times"
+                  @icon="xmark"
                   class="cancel cancel-edit"
                 />
               {{/if}}
@@ -395,7 +395,7 @@
                   <span class="col">
                     <DButton
                       @action={{fn this.removeUpload upload}}
-                      @icon="times"
+                      @icon="xmark"
                       class="second btn-default btn-default cancel-edit"
                     />
                   </span>
@@ -546,7 +546,7 @@
         <DButton
           @action={{this.destroyTheme}}
           @label="admin.customize.delete"
-          @icon="trash-alt"
+          @icon="trash-can"
           class="btn-danger"
         />
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
index 110aa04bcb8..70a6286ec87 100644
--- a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
@@ -61,7 +61,7 @@
                 {{on "click" (fn this.handleShowIncomingEmail l.id)}}
                 title={{i18n "admin.email.details_title"}}
               >
-                {{d-icon "info-circle"}}
+                {{d-icon "circle-info"}}
               </a>
             {{/if}}
           </td>
diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
index cde89fa060f..2a120f53f7d 100644
--- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
@@ -9,7 +9,11 @@
       <EmailGroupUserChooser
         @value={{this.username}}
         @onChange={{action "updateUsername"}}
-        @options={{hash maximum=1}}
+        @options={{hash
+          maximum=1
+          caretDownIcon="caret-down"
+          caretUpIcon="caret-up"
+        }}
       />
       <DButton
         @action={{this.refresh}}
diff --git a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
index b9a45aebd8c..80b4ccc495c 100644
--- a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
@@ -73,7 +73,7 @@
               {{on "click" (fn this.handleShowIncomingEmail email.id)}}
               title={{i18n "admin.email.details_title"}}
             >
-              {{d-icon "info-circle"}}
+              {{d-icon "circle-info"}}
             </a>
           </td>
         </tr>
diff --git a/app/assets/javascripts/admin/addon/templates/email-sent.hbs b/app/assets/javascripts/admin/addon/templates/email-sent.hbs
index bedeef4c5ce..3e4a4334a84 100644
--- a/app/assets/javascripts/admin/addon/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-sent.hbs
@@ -51,7 +51,7 @@
           </td>
           <td class="sent-email-address">
             {{#if l.bounced}}{{d-icon
-                "redo"
+                "arrow-rotate-right"
                 title="admin.email.bounced"
               }}{{/if}}
             <p><a
diff --git a/app/assets/javascripts/admin/addon/templates/emojis.hbs b/app/assets/javascripts/admin/addon/templates/emojis.hbs
index 9161d07b3af..4d8a20e20a4 100644
--- a/app/assets/javascripts/admin/addon/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/addon/templates/emojis.hbs
@@ -51,7 +51,7 @@
             <td class="action">
               <DButton
                 @action={{fn this.destroyEmoji e}}
-                @icon="far-trash-alt"
+                @icon="trash-can"
                 class="btn-danger"
               />
             </td>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
index b8b6e55b880..36bb4813a0a 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
@@ -95,12 +95,12 @@
               {{else}}
                 <DButton
                   @action={{fn this.destroyRecord item}}
-                  @icon="far-trash-alt"
+                  @icon="trash-can"
                   class="btn-default btn-danger"
                 />
                 <DButton
                   @action={{fn this.edit item}}
-                  @icon="pencil-alt"
+                  @icon="pencil"
                   class="btn-default"
                 />
                 {{#if item.isBlocked}}
diff --git a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
index 54ce7a496cf..689e4e37644 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
@@ -18,7 +18,7 @@
         >
           <span class="label">{{i18n "admin.logs.action"}}</span>:
           {{this.actionFilter}}
-          {{d-icon "times-circle"}}
+          {{d-icon "circle-xmark"}}
         </a>
       {{/if}}
       {{#if this.filters.acting_user}}
@@ -31,7 +31,7 @@
               "admin.logs.staff_actions.staff_user"
             }}</span>:
           {{this.filters.acting_user}}
-          {{d-icon "times-circle"}}
+          {{d-icon "circle-xmark"}}
         </a>
       {{/if}}
       {{#if this.filters.target_user}}
@@ -44,7 +44,7 @@
               "admin.logs.staff_actions.target_user"
             }}</span>:
           {{this.filters.target_user}}
-          {{d-icon "times-circle"}}
+          {{d-icon "circle-xmark"}}
         </a>
       {{/if}}
       {{#if this.filters.subject}}
@@ -57,7 +57,7 @@
               "admin.logs.staff_actions.subject"
             }}</span>:
           {{this.filters.subject}}
-          {{d-icon "times-circle"}}
+          {{d-icon "circle-xmark"}}
         </a>
       {{/if}}
     </div>
@@ -109,7 +109,7 @@
                       class="deleted-user"
                       title={{i18n "admin.user.deleted"}}
                     >
-                      {{d-icon "far-trash-alt"}}
+                      {{d-icon "trash-can"}}
                     </span>
                   {{/if}}
                 </div>
@@ -154,14 +154,14 @@
                     <a
                       href
                       {{on "click" (fn this.showCustomDetailsModal item)}}
-                    >{{d-icon "info-circle"}}
+                    >{{d-icon "circle-info"}}
                       {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                   {{#if item.useModalForDetails}}
                     <a
                       href
                       {{on "click" (fn this.showDetailsModal item)}}
-                    >{{d-icon "info-circle"}}
+                    >{{d-icon "circle-info"}}
                       {{i18n "admin.logs.staff_actions.show"}}</a>
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/permalinks.hbs b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
index 3dec4e30015..135b614467f 100644
--- a/app/assets/javascripts/admin/addon/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
@@ -56,7 +56,7 @@
                 {{/if}}
                 {{#if pl.external_url}}
                   {{#if pl.linkIsExternal}}
-                    {{d-icon "external-link-alt"}}
+                    {{d-icon "up-right-from-square"}}
                   {{/if}}
                   <a href={{pl.external_url}}>{{pl.external_url}}</a>
                 {{/if}}
@@ -67,7 +67,7 @@
               <td class="col action" style="text-align: right;">
                 <DButton
                   @action={{fn this.destroyRecord pl}}
-                  @icon="far-trash-alt"
+                  @icon="trash-can"
                   class="btn-danger"
                 />
               </td>
diff --git a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
index 2cc9180a05e..6edfa99661d 100644
--- a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
@@ -35,7 +35,7 @@
   </AdminPageHeader>
 
   <div class="alert alert-info -top-margin admin-plugins-howto">
-    {{dIcon "info-circle"}}
+    {{dIcon "circle-info"}}
     <a href="https://meta.discourse.org/t/install-a-plugin/19157">
       {{i18n "admin.plugins.howto"}}
     </a>
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
index 52e9aa33530..8d9f1643830 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
@@ -14,7 +14,7 @@
       @action={{this.showReseedModal}}
       @label="admin.reseed.action.label"
       @title="admin.reseed.action.title"
-      @icon="sync"
+      @icon="arrows-rotate"
       class="btn-default"
     />
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs
index c04d2a6109d..a2c69d3864f 100644
--- a/app/assets/javascripts/admin/addon/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs
@@ -232,7 +232,7 @@
       {{#if this.canDisableSecondFactor}}
         <DButton
           @action={{this.disableSecondFactor}}
-          @icon="unlock-alt"
+          @icon="unlock-keyhole"
           @label="user.second_factor.disable"
           class="btn-default"
         />
@@ -365,7 +365,7 @@
       {{#if this.model.can_revoke_admin}}
         <DButton
           @action={{this.revokeAdmin}}
-          @icon="shield-alt"
+          @icon="shield-halved"
           @label="admin.user.revoke_admin"
           class="btn-default"
         />
@@ -373,7 +373,7 @@
       {{#if this.model.can_grant_admin}}
         <DButton
           @action={{this.grantAdmin}}
-          @icon="shield-alt"
+          @icon="shield-halved"
           @label="admin.user.grant_admin"
           class="btn-default grant-admin"
         />
@@ -388,7 +388,7 @@
       {{#if this.model.can_revoke_moderation}}
         <DButton
           @action={{this.revokeModeration}}
-          @icon="shield-alt"
+          @icon="shield-halved"
           @label="admin.user.revoke_moderation"
           class="btn-default"
         />
@@ -396,7 +396,7 @@
       {{#if this.model.can_grant_moderation}}
         <DButton
           @action={{this.grantModeration}}
-          @icon="shield-alt"
+          @icon="shield-halved"
           @label="admin.user.grant_moderation"
           class="btn-default"
         />
@@ -423,7 +423,7 @@
           />
           <DButton
             @action={{this.restoreTrustLevel}}
-            @icon="times"
+            @icon="xmark"
             class="cancel no-text"
           />
         </div>
@@ -585,7 +585,7 @@
         <div class="controls">
           <DButton
             @label="admin.user.clear_penalty_history.title"
-            @icon="times"
+            @icon="xmark"
             @action={{this.clearPenaltyHistory}}
             class="btn-default"
           />
@@ -618,7 +618,7 @@
         <div class="controls">
           <DButton @icon="check" @action={{this.saveCustomGroups}} class="ok" />
           <DButton
-            @icon="times"
+            @icon="xmark"
             @action={{this.resetCustomGroups}}
             class="cancel"
           />
@@ -644,7 +644,7 @@
               class="ok"
             />
             <DButton
-              @icon="times"
+              @icon="xmark"
               @action={{this.resetPrimaryGroup}}
               class="cancel"
             />
@@ -694,7 +694,7 @@
         {{#if this.model.post_count}}
           <DButton
             @action={{this.showDeletePostsConfirmation}}
-            @icon="far-trash-alt"
+            @icon="trash-can"
             @label="admin.user.delete_posts.button"
             class="btn-danger"
           />
@@ -782,7 +782,7 @@
           <div class="controls">
             <DButton
               @action={{this.deleteSSORecord}}
-              @icon="far-trash-alt"
+              @icon="trash-can"
               @label="admin.user.discourse_connect.delete_sso_record"
               class="btn-danger"
             />
@@ -877,7 +877,7 @@
     {{#if this.model.can_be_anonymized}}
       <DButton
         @label="admin.user.anonymize"
-        @icon="exclamation-triangle"
+        @icon="triangle-exclamation"
         @action={{this.anonymize}}
         class="btn-danger btn-anonymize"
       />
@@ -886,7 +886,7 @@
     {{#if this.model.canBeDeleted}}
       <DButton
         @label="admin.user.delete"
-        @icon="trash-alt"
+        @icon="trash-can"
         @action={{this.destroyUser}}
         class="btn-danger btn-user-delete"
       />
@@ -895,7 +895,7 @@
     {{#if this.model.can_be_merged}}
       <DButton
         @label="admin.user.merge.button"
-        @icon="arrows-alt-h"
+        @icon="left-right"
         @action={{this.promptTargetUser}}
         class="btn-danger btn-user-merge"
       />
@@ -906,7 +906,7 @@
     <div class="clearfix"></div>
     <br />
     <div class="pull-right">
-      {{d-icon "exclamation-triangle"}}
+      {{d-icon "triangle-exclamation"}}
       {{this.deleteExplanation}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs
index ca429574b62..21ae2d26d95 100644
--- a/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs
@@ -145,11 +145,11 @@
       {{#if this.model.tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
         {{#if this.model.tl3Requirements.on_grace_period}}
-          {{d-icon "times"}}
+          {{d-icon "xmark"}}
           {{i18n "admin.user.tl3_requirements.on_grace_period"}}
         {{else}}
           {{! not on grace period }}
-          {{d-icon "times"}}
+          {{d-icon "xmark"}}
           {{i18n "admin.user.tl3_requirements.does_not_qualify"}}
           {{i18n "admin.user.tl3_requirements.will_be_demoted"}}
         {{/if}}
@@ -180,7 +180,7 @@
           {{d-icon "lock"}}
           {{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}}
         {{else}}
-          {{d-icon "times"}}
+          {{d-icon "xmark"}}
           {{i18n "admin.user.tl3_requirements.does_not_qualify"}}
         {{/if}}
       {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
index 881ae60d171..e60890452ac 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
@@ -256,10 +256,10 @@
               </span>
               <span class="directory-table__value">
                 {{#if user.admin}}
-                  {{d-icon "shield-alt" title="admin.title"}}
+                  {{d-icon "shield-halved" title="admin.title"}}
                 {{/if}}
                 {{#if user.moderator}}
-                  {{d-icon "shield-alt" title="admin.moderator"}}
+                  {{d-icon "shield-halved" title="admin.moderator"}}
                 {{/if}}
                 {{#if user.second_factor_enabled}}
                   {{d-icon "lock" title="admin.user.second_factor_enabled"}}
diff --git a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
index 15dde5f9260..c06ae14cda6 100644
--- a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
@@ -26,7 +26,7 @@
 
   <DButton
     @label="admin.watched_words.clear_all"
-    @icon="trash-alt"
+    @icon="trash-can"
     @action={{this.clearAll}}
     class="btn-danger clear-all"
   />
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs
index 2af64ed2a1d..064a246e90f 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-index.hbs
@@ -47,12 +47,12 @@
                   class="btn btn-default no-text"
                   title={{i18n "admin.web_hooks.edit"}}
                 >
-                  {{d-icon "far-edit"}}
+                  {{d-icon "far-pen-to-square"}}
                 </LinkTo>
 
                 <DButton
                   @action={{fn this.destroyWebhook webhook}}
-                  @icon="times"
+                  @icon="xmark"
                   @title="delete"
                   class="destroy btn-danger"
                 />
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
index 80e5461e7c3..3c9f2371bb0 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
@@ -9,14 +9,14 @@
 
     <DButton
       @action={{this.edit}}
-      @icon="far-edit"
+      @icon="far-pen-to-square"
       @title={{i18n "admin.web_hooks.edit"}}
       class="no-text admin-webhooks__edit-button"
     />
 
     <DButton
       @action={{this.destroyWebhook}}
-      @icon="times"
+      @icon="xmark"
       @title="delete"
       class="destroy btn-danger admin-webhooks__delete-button"
     />
diff --git a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs
index 91e7939eafa..f163f477e61 100644
--- a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs
+++ b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.gjs
@@ -35,7 +35,7 @@ export default class DialogHolder extends Component {
               <DButton
                 @action={{this.dialog.cancel}}
                 @title="modal.close"
-                @icon="times"
+                @icon="xmark"
                 class="btn-flat dialog-close close"
               />
             </div>
diff --git a/app/assets/javascripts/discourse/app/components/about-page.gjs b/app/assets/javascripts/discourse/app/components/about-page.gjs
index 78be9620a0d..f95b35c5674 100644
--- a/app/assets/javascripts/discourse/app/components/about-page.gjs
+++ b/app/assets/javascripts/discourse/app/components/about-page.gjs
@@ -47,7 +47,7 @@ export default class AboutPage extends Component {
       },
       {
         class: "admins",
-        icon: "shield-alt",
+        icon: "shield-halved",
         text: I18n.t("about.admin_count", {
           count: this.adminsCount,
           formatted_number: I18n.toNumber(this.adminsCount, { precision: 0 }),
@@ -55,7 +55,7 @@ export default class AboutPage extends Component {
       },
       {
         class: "moderators",
-        icon: "shield-alt",
+        icon: "shield-halved",
         text: I18n.t("about.moderator_count", {
           count: this.moderatorsCount,
           formatted_number: I18n.toNumber(this.moderatorsCount, {
@@ -65,7 +65,7 @@ export default class AboutPage extends Component {
       },
       {
         class: "site-creation-date",
-        icon: "calendar-alt",
+        icon: "calendar-days",
         text: this.siteAgeString,
       },
     ];
@@ -83,7 +83,7 @@ export default class AboutPage extends Component {
         period: I18n.t("about.activities.periods.last_7_days"),
       },
       {
-        icon: "pencil-alt",
+        icon: "pencil",
         class: "posts",
         activityText: I18n.t("about.activities.posts", {
           count: this.args.model.stats.posts_last_day,
@@ -92,7 +92,7 @@ export default class AboutPage extends Component {
         period: I18n.t("about.activities.periods.today"),
       },
       {
-        icon: "user-friends",
+        icon: "user-group",
         class: "active-users",
         activityText: I18n.t("about.activities.active_users", {
           count: this.args.model.stats.active_users_7_days,
diff --git a/app/assets/javascripts/discourse/app/components/actions-summary.gjs b/app/assets/javascripts/discourse/app/components/actions-summary.gjs
index 2a6c2eadd0f..4401d23e783 100644
--- a/app/assets/javascripts/discourse/app/components/actions-summary.gjs
+++ b/app/assets/javascripts/discourse/app/components/actions-summary.gjs
@@ -9,7 +9,7 @@ const ActionsSummary = <template>
   {{/each}}
   {{#if @data.deleted_at}}
     <div class="post-action deleted-post">
-      {{dIcon "far-trash-alt"}}
+      {{dIcon "trash-can"}}
       <a
         class="trigger-user-card"
         data-user-card={{@data.deletedByUsername}}
diff --git a/app/assets/javascripts/discourse/app/components/activation-controls.gjs b/app/assets/javascripts/discourse/app/components/activation-controls.gjs
index ae36b585c61..ac28c166028 100644
--- a/app/assets/javascripts/discourse/app/components/activation-controls.gjs
+++ b/app/assets/javascripts/discourse/app/components/activation-controls.gjs
@@ -26,7 +26,7 @@ export default class ActivationControls extends Component {
         <DButton
           @action={{@editActivationEmail}}
           @label="login.change_email"
-          @icon="pencil-alt"
+          @icon="pencil"
           class="edit-email"
         />
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/admin-post-menu.gjs b/app/assets/javascripts/discourse/app/components/admin-post-menu.gjs
index 29c8700a7e5..cd2337c1711 100644
--- a/app/assets/javascripts/discourse/app/components/admin-post-menu.gjs
+++ b/app/assets/javascripts/discourse/app/components/admin-post-menu.gjs
@@ -67,7 +67,7 @@ export default class AdminPostMenu extends Component {
               "post.controls.revert_to_regular"
               "post.controls.convert_to_moderator"
             }}
-            @icon="shield-alt"
+            @icon="shield-halved"
             class={{concatClass
               "btn btn-transparent toggle-post-type"
               (if @data.transformedPost.isModeratorAction "btn-success")
@@ -170,7 +170,7 @@ export default class AdminPostMenu extends Component {
         <dropdown.item>
           <DButton
             @label="post.controls.permanently_delete"
-            @icon="trash-alt"
+            @icon="trash-can"
             class="btn btn-transparent permanently-delete"
             @action={{fn this.topicAction "permanentlyDeletePost"}}
           />
@@ -182,7 +182,7 @@ export default class AdminPostMenu extends Component {
           <dropdown.item>
             <DButton
               @label="post.controls.unwiki"
-              @icon="far-edit"
+              @icon="far-pen-to-square"
               class={{concatClass
                 "btn btn-transparent wiki wikied"
                 (if @data.transformedPost.wiki "btn-success")
@@ -194,7 +194,7 @@ export default class AdminPostMenu extends Component {
           <dropdown.item>
             <DButton
               @label="post.controls.wiki"
-              @icon="far-edit"
+              @icon="far-pen-to-square"
               class="btn btn-transparent wiki"
               @action={{fn this.topicAction "toggleWiki"}}
             />
@@ -217,7 +217,7 @@ export default class AdminPostMenu extends Component {
         <dropdown.item>
           <DButton
             @label="post.controls.rebake"
-            @icon="sync-alt"
+            @icon="rotate"
             class="btn btn-transparent rebuild-html"
             @action={{fn this.topicAction "rebakePost"}}
           />
diff --git a/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js b/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
index 1159f4af1ef..28bb6486762 100644
--- a/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/auth-token-dropdown.js
@@ -15,13 +15,13 @@ export default class AuthTokenDropdown extends DropdownSelectBoxComponent {
     return [
       {
         id: "notYou",
-        icon: "user-times",
+        icon: "user-xmark",
         name: I18n.t("user.auth_tokens.not_you"),
         description: "",
       },
       {
         id: "logOut",
-        icon: "sign-out-alt",
+        icon: "right-from-bracket",
         name: I18n.t("user.log_out"),
         description: "",
       },
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
index 8ca39516440..6dc1ad954cb 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js
@@ -27,14 +27,14 @@ export default class BookmarkActionsDropdown extends DropdownSelectBoxComponent
 
     actions.push({
       id: ACTION_REMOVE,
-      icon: "trash-alt",
+      icon: "trash-can",
       name: I18n.t("post.bookmarks.actions.delete_bookmark.name"),
       description: I18n.t("post.bookmarks.actions.delete_bookmark.description"),
     });
 
     actions.push({
       id: ACTION_EDIT,
-      icon: "pencil-alt",
+      icon: "pencil",
       name: I18n.t("post.bookmarks.actions.edit_bookmark.name"),
       description: I18n.t("post.bookmarks.actions.edit_bookmark.description"),
     });
@@ -42,7 +42,7 @@ export default class BookmarkActionsDropdown extends DropdownSelectBoxComponent
     if (bookmark.reminder_at) {
       actions.push({
         id: ACTION_CLEAR_REMINDER,
-        icon: "history",
+        icon: "clock-rotate-left",
         name: I18n.t("post.bookmarks.actions.clear_bookmark_reminder.name"),
         description: I18n.t(
           "post.bookmarks.actions.clear_bookmark_reminder.description"
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-list.hbs b/app/assets/javascripts/discourse/app/components/bookmark-list.hbs
index a1e513c845a..1a1ba76ead1 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-list.hbs
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.hbs
@@ -12,7 +12,7 @@
                 <FlatButton
                   @action={{this.toggleBulkSelect}}
                   @class="bulk-select"
-                  @icon="tasks"
+                  @icon="list-check"
                   @title="bookmarks.bulk.toggle"
                 />
               </th>
@@ -50,7 +50,7 @@
                 <FlatButton
                   @action={{this.toggleBulkSelect}}
                   @class="bulk-select"
-                  @icon="tasks"
+                  @icon="list-check"
                   @title="bookmarks.bulk.toggle"
                 />
                 {{i18n "topic.title"}}
@@ -101,7 +101,7 @@
                   {{/if}}
                   {{#if bookmark.name}}
                     <span class="bookmark-metadata-item">
-                      {{d-icon "info-circle"}}<span>{{bookmark.name}}</span>
+                      {{d-icon "circle-info"}}<span>{{bookmark.name}}</span>
                     </span>
                   {{/if}}
                 </div>
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs b/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs
index bc5eee62958..1df20878bd6 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs
+++ b/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs
@@ -173,7 +173,7 @@ export default class BookmarkMenu extends Component {
       this.toasts.success({
         duration: 1500,
         data: {
-          icon: "trash-alt",
+          icon: "trash-can",
           message: I18n.t("bookmarks.deleted_bookmark_success"),
         },
       });
@@ -251,7 +251,7 @@ export default class BookmarkMenu extends Component {
         <DropdownMenu as |dropdown|>
           {{#unless this.showEditDeleteMenu}}
             <dropdown.item class="bookmark-menu__title">
-              {{icon "check-circle"}}
+              {{icon "circle-check"}}
               <span>{{i18n "bookmarks.bookmarked_success"}}</span>
             </dropdown.item>
           {{/unless}}
@@ -262,7 +262,7 @@ export default class BookmarkMenu extends Component {
               data-menu-option-id="edit"
             >
               <DButton
-                @icon="pencil-alt"
+                @icon="pencil"
                 @label="edit"
                 @action={{this.onEditBookmark}}
                 @class="bookmark-menu__row-btn btn-transparent"
@@ -275,7 +275,7 @@ export default class BookmarkMenu extends Component {
               data-menu-option-id="delete"
             >
               <DButton
-                @icon="trash-alt"
+                @icon="trash-can"
                 @label="delete"
                 @action={{this.onRemoveBookmark}}
                 @class="bookmark-menu__row-btn btn-transparent btn-danger"
diff --git a/app/assets/javascripts/discourse/app/components/bulk-group-member-dropdown.js b/app/assets/javascripts/discourse/app/components/bulk-group-member-dropdown.js
index 4cf6c94d57e..0b4653be113 100644
--- a/app/assets/javascripts/discourse/app/components/bulk-group-member-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/bulk-group-member-dropdown.js
@@ -9,7 +9,7 @@ import {
 
 @classNames("bulk-group-member-dropdown")
 @selectKitOptions({
-  icon: "cog",
+  icon: "gear",
   showFullTitle: false,
 })
 @pluginApiIdentifiers("bulk-group-member-dropdown")
@@ -22,7 +22,7 @@ export default class BulkGroupMemberDropdown extends DropdownSelectBoxComponent
       id: "removeMembers",
       name: I18n.t("groups.members.remove_members"),
       description: I18n.t("groups.members.remove_members_description"),
-      icon: "user-times",
+      icon: "user-xmark",
     });
 
     if (this.bulkSelection.some((m) => !m.owner)) {
@@ -30,7 +30,7 @@ export default class BulkGroupMemberDropdown extends DropdownSelectBoxComponent
         id: "makeOwners",
         name: I18n.t("groups.members.make_owners"),
         description: I18n.t("groups.members.make_owners_description"),
-        icon: "shield-alt",
+        icon: "shield-halved",
       });
     }
 
@@ -39,7 +39,7 @@ export default class BulkGroupMemberDropdown extends DropdownSelectBoxComponent
         id: "removeOwners",
         name: I18n.t("groups.members.remove_owners"),
         description: I18n.t("groups.members.remove_owners_description"),
-        icon: "shield-alt",
+        icon: "shield-halved",
       });
     }
 
diff --git a/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs b/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs
index cfda28077e3..0594e444ff9 100644
--- a/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs
+++ b/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs
@@ -43,7 +43,7 @@ export default class BulkSelectTopicsDropdown extends Component {
     let options = [
       {
         id: "update-category",
-        icon: "pencil-alt",
+        icon: "pencil",
         name: i18n("topic_bulk_actions.update_category.name"),
         visible: ({ topics }) => {
           return !topics.some((t) => t.isPrivateMessage);
@@ -78,7 +78,7 @@ export default class BulkSelectTopicsDropdown extends Component {
       },
       {
         id: "archive-messages",
-        icon: "archive",
+        icon: "box-archive",
         name: i18n("topic_bulk_actions.archive_messages.name"),
         visible: ({ topics }) => topics.every((t) => t.isPrivateMessage),
       },
@@ -127,7 +127,7 @@ export default class BulkSelectTopicsDropdown extends Component {
       },
       {
         id: "delete-topics",
-        icon: "trash-alt",
+        icon: "trash-can",
         name: i18n("topic_bulk_actions.delete_topics.name"),
         visible: ({ currentUser }) => currentUser.staff,
       },
diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
index a7866ed18c7..81201cfe9e7 100644
--- a/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
+++ b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js
@@ -13,6 +13,6 @@ export default class CategoriesBoxesTopic extends Component {
     if (closed || archived) {
       return "lock";
     }
-    return "far-file-alt";
+    return "far-file-lines";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/components/category-permission-row.gjs b/app/assets/javascripts/discourse/app/components/category-permission-row.gjs
index d2b83587ab1..47c8448b904 100644
--- a/app/assets/javascripts/discourse/app/components/category-permission-row.gjs
+++ b/app/assets/javascripts/discourse/app/components/category-permission-row.gjs
@@ -28,11 +28,11 @@ export default class CategoryPermissionRow extends Component {
   }
 
   get canCreateIcon() {
-    return this.canCreate ? "check-square" : "far-square";
+    return this.canCreate ? "square-check" : "far-square";
   }
 
   get canReplyIcon() {
-    return this.canReply ? "check-square" : "far-square";
+    return this.canReply ? "square-check" : "far-square";
   }
 
   get replyGrantedClass() {
@@ -138,7 +138,7 @@ export default class CategoryPermissionRow extends Component {
         {{/if}}
       </span>
       <span class="options actionable">
-        <DButton @icon="check-square" @disabled={{true}} class="btn-flat see" />
+        <DButton @icon="square-check" @disabled={{true}} class="btn-flat see" />
 
         <DButton
           @icon={{this.canReplyIcon}}
@@ -162,7 +162,7 @@ export default class CategoryPermissionRow extends Component {
         <DButton
           class="remove-permission btn-flat"
           @action={{this.removeRow}}
-          @icon="far-trash-alt"
+          @icon="trash-can"
         />
       </span>
     </div>
diff --git a/app/assets/javascripts/discourse/app/components/composer-container.hbs b/app/assets/javascripts/discourse/app/components/composer-container.hbs
index 758a8e9ace6..edc15d9b4a6 100644
--- a/app/assets/javascripts/discourse/app/components/composer-container.hbs
+++ b/app/assets/javascripts/discourse/app/components/composer-container.hbs
@@ -73,7 +73,7 @@
                 <LinkToInput
                   @onClick={{this.composer.displayEditReason}}
                   @showInput={{this.composer.showEditReason}}
-                  @icon="info-circle"
+                  @icon="circle-info"
                   class="display-edit-reason"
                 >
                   <TextField
@@ -274,9 +274,9 @@
                 class="cancel"
               >
                 {{#if this.composer.canEdit}}
-                  {{d-icon "times"}}
+                  {{d-icon "xmark"}}
                 {{else}}
-                  {{d-icon "far-trash-alt"}}
+                  {{d-icon "trash-can"}}
                 {{/if}}
               </a>
             {{else}}
@@ -342,7 +342,7 @@
                 @action={{this.composer.togglePreview}}
                 @title="composer.hide_preview"
                 @ariaLabel="composer.hide_preview"
-                @icon="pencil-alt"
+                @icon="pencil"
                 class="hide-preview"
               />
             {{/if}}
@@ -368,7 +368,7 @@
                   href
                   id="cancel-file-upload"
                   {{on "click" this.composer.cancelUpload}}
-                >{{d-icon "times"}}</a>
+                >{{d-icon "xmark"}}</a>
               {{/if}}
             </div>
           {{/if}}
@@ -387,9 +387,9 @@
                     this.composer.model.draftConflictUser
                     imageSize="small"
                   }}
-                  {{d-icon "user-edit"}}
+                  {{d-icon "user-pen"}}
                 {{else}}
-                  {{d-icon "exclamation-triangle"}}
+                  {{d-icon "triangle-exclamation"}}
                 {{/if}}
                 {{#if this.site.desktopView}}
                   {{this.composer.model.draftStatus}}
@@ -402,7 +402,7 @@
             <DButton
               @action={{this.composer.togglePreview}}
               @translatedTitle={{this.composer.toggleText}}
-              @icon="angle-double-left"
+              @icon="angles-left"
               class={{concat-class
                 "btn-transparent btn-mini-toggle toggle-preview"
                 (unless this.composer.showPreview "active")
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index 7f444cc3ec4..46a27ed3335 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -951,7 +951,7 @@ export default class ComposerEditor extends Component.extend(
     toolbar.addButton({
       id: "options",
       group: "extras",
-      icon: "cog",
+      icon: "gear",
       title: "composer.options",
       sendAction: this.onExpandPopupMenuOptions.bind(this),
       popupMenu: true,
diff --git a/app/assets/javascripts/discourse/app/components/composer-tip-close-button.hbs b/app/assets/javascripts/discourse/app/components/composer-tip-close-button.hbs
index 0090d73f9d7..805a2879914 100644
--- a/app/assets/javascripts/discourse/app/components/composer-tip-close-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/composer-tip-close-button.hbs
@@ -1,6 +1,6 @@
 <DButton
   @action={{@action}}
-  @icon="times"
+  @icon="xmark"
   @label="composer.esc"
   @ariaLabel="composer.esc_label"
   class="btn-transparent close"
diff --git a/app/assets/javascripts/discourse/app/components/composer-toggles.js b/app/assets/javascripts/discourse/app/components/composer-toggles.js
index 8462bb8036a..39d15632681 100644
--- a/app/assets/javascripts/discourse/app/components/composer-toggles.js
+++ b/app/assets/javascripts/discourse/app/components/composer-toggles.js
@@ -28,7 +28,7 @@ export default class ComposerToggles extends Component {
   @discourseComputed("composeState")
   toggleIcon(composeState) {
     return composeState === "draft" || composeState === "saving"
-      ? "times"
+      ? "xmark"
       : "chevron-down";
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
index 34bdcd2c512..1cb14d030e3 100644
--- a/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/create-topic-button.hbs
@@ -13,7 +13,7 @@
     <:tooltip>
       {{#if @disabled}}
         <DTooltip
-          @icon="info-circle"
+          @icon="circle-info"
           @content={{i18n "topic.create_disabled_category"}}
         />
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 7913bc418ed..139c3be3fed 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -150,7 +150,7 @@ class Toolbar {
       this.addButton({
         id: "toggle-direction",
         group: "extras",
-        icon: "exchange-alt",
+        icon: "right-left",
         shortcut: "Shift+6",
         title: "composer.toggle_direction",
         preventFocus: true,
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox.js b/app/assets/javascripts/discourse/app/components/d-lightbox.js
index 701c6ecd471..e8f57ff7089 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox.js
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox.js
@@ -180,7 +180,7 @@ export default class DLightbox extends Component {
   }
 
   get zoomButtonIcon() {
-    return this.isZoomed ? "search-minus" : "search-plus";
+    return this.isZoomed ? "magnifying-glass-minus" : "magnifying-glass-plus";
   }
 
   @bind
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
index d7fbb213f91..9037cc5ef76 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/body.hbs
@@ -23,7 +23,7 @@
       <DButton
         {{on "click" @reloadImage passive=true capture=true}}
         @title="experimental_lightbox.buttons.redo"
-        @icon="redo"
+        @icon="arrow-rotate-right"
         class="d-lightbox__retry-button btn-flat"
       />
       <span>{{i18n "experimental_lightbox.image_load_error"}}</span>
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
index 2b77bb0a8c8..6539b552b2f 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/footer.hbs
@@ -29,7 +29,7 @@
       <DButton
         {{on "click" @rotateImage passive=true capture=true}}
         @title="experimental_lightbox.buttons.rotate"
-        @icon="redo"
+        @icon="arrow-rotate-right"
         @ariaHidden="true"
         aria-hidden="true"
         class="d-lightbox__rotate-button btn-flat"
diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs b/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
index d996384370b..bbacaa2b7fc 100644
--- a/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-lightbox/header.hbs
@@ -27,7 +27,7 @@
       <DButton
         {{on "click" @openInNewTab passive=true capture=true}}
         @title="experimental_lightbox.buttons.newtab"
-        @icon="external-link-alt"
+        @icon="up-right-from-square"
         @ariaHidden="true"
         aria-hidden="true"
         class="d-lightbox__new-tab-button btn-flat"
@@ -46,7 +46,7 @@
     <DButton
       {{on "click" @close passive=true capture=true}}
       @title="experimental_lightbox.buttons.close"
-      @icon="times"
+      @icon="xmark"
       @ariaHidden="true"
       class="d-lightbox__close-button btn-flat"
     />
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.gjs b/app/assets/javascripts/discourse/app/components/d-modal.gjs
index 7ca44e041a7..db7796f0531 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.gjs
+++ b/app/assets/javascripts/discourse/app/components/d-modal.gjs
@@ -350,7 +350,7 @@ export default class DModal extends Component {
                 </div>
               {{else if this.dismissable}}
                 <DButton
-                  @icon="times"
+                  @icon="xmark"
                   @action={{this.handleCloseButton}}
                   @title="modal.close"
                   class="btn-transparent modal-close"
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
index 27edb49b27d..939254736ab 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
@@ -74,7 +74,7 @@
   {{#if this.tag}}
     {{#if this.showToggleInfo}}
       <DButton
-        @icon={{if this.currentUser.staff "wrench" "info-circle"}}
+        @icon={{if this.currentUser.staff "wrench" "circle-info"}}
         @ariaLabel="tagging.info"
         @action={{this.toggleInfo}}
         id="show-tag-info"
diff --git a/app/assets/javascripts/discourse/app/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/components/date-time-input.hbs
index f2d209d19b1..c5951debb97 100644
--- a/app/assets/javascripts/discourse/app/components/date-time-input.hbs
+++ b/app/assets/javascripts/discourse/app/components/date-time-input.hbs
@@ -28,7 +28,7 @@
 
 {{#if this.clearable}}
   <DButton
-    @icon="times"
+    @icon="xmark"
     @action={{this.onClear}}
     class="btn-default clear-date-time"
   />
diff --git a/app/assets/javascripts/discourse/app/components/dialog-messages/group-delete.hbs b/app/assets/javascripts/discourse/app/components/dialog-messages/group-delete.hbs
index b6d45b96cb0..36efd638f8e 100644
--- a/app/assets/javascripts/discourse/app/components/dialog-messages/group-delete.hbs
+++ b/app/assets/javascripts/discourse/app/components/dialog-messages/group-delete.hbs
@@ -15,6 +15,6 @@
 {{/if}}
 
 <p>
-  {{d-icon "exclamation-triangle"}}
+  {{d-icon "triangle-exclamation"}}
   {{i18n "admin.groups.delete_warning"}}
 </p>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
index 4e4c98ae62b..0b063a22587 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/app/components/discourse-banner.hbs
@@ -4,7 +4,7 @@
       <div class="floated-buttons">
         {{#if this.currentUser.staff}}
           <a href={{this.banner.url}} class="btn btn-transparent edit-banner">
-            {{d-icon "pencil-alt"}}
+            {{d-icon "pencil"}}
             {{#if this.site.desktopView}}
               {{html-safe (i18n "banner.edit")}}
             {{/if}}
@@ -12,7 +12,7 @@
         {{/if}}
 
         <DButton
-          @icon="times"
+          @icon="xmark"
           @action={{this.dismiss}}
           @title="banner.close"
           class="btn-transparent close"
diff --git a/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.hbs b/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.hbs
index 58bf6d34f12..bc04df8606c 100644
--- a/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.hbs
@@ -24,7 +24,7 @@
     {{#if this.newQueryString}}
       <div class="topic-query-filter__controls">
         <DButton
-          @icon="times"
+          @icon="xmark"
           @action={{this.clearInput}}
           @disabled={{unless this.newQueryString "true"}}
         />
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
index 6caa8d1bd43..eecaab69a19 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-general.hbs
@@ -1,6 +1,6 @@
 {{#if this.category.isUncategorizedCategory}}
   <p class="warning">
-    {{d-icon "exclamation-triangle"}}
+    {{d-icon "triangle-exclamation"}}
     {{html-safe
       (i18n
         "category.uncategorized_general_warning"
@@ -53,7 +53,7 @@
         <br />
         <DButton
           @action={{this.showCategoryTopic}}
-          @icon="pencil-alt"
+          @icon="pencil"
           @label="category.change_in_category_topic"
           class="btn-default edit-category-description"
         />
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
index 84322a457dd..0216158deca 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tags.hbs
@@ -70,7 +70,7 @@
         <DButton
           @label="category.required_tag_group.delete"
           @action={{fn this.deleteRequiredTagGroup rtg}}
-          @icon="trash-alt"
+          @icon="trash-can"
           class="delete-required-tag-group"
         />
       </div>
diff --git a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs
index c33573afce9..4bb019d204a 100644
--- a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.hbs
@@ -48,7 +48,7 @@
 
   {{#if this.willCloseImmediately}}
     <div class="warning">
-      {{d-icon "exclamation-triangle"}}
+      {{d-icon "triangle-exclamation"}}
       {{this.willCloseI18n}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/email-dropdown.js b/app/assets/javascripts/discourse/app/components/email-dropdown.js
index fd8994ef37b..67cb6115e22 100644
--- a/app/assets/javascripts/discourse/app/components/email-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/email-dropdown.js
@@ -20,7 +20,7 @@ export default class EmailDropdown extends DropdownSelectBoxComponent {
     if (this.email.primary) {
       content.push({
         id: "updateEmail",
-        icon: "pencil-alt",
+        icon: "pencil",
         name: I18n.t("user.email.update_email"),
         description: "",
       });
@@ -38,7 +38,7 @@ export default class EmailDropdown extends DropdownSelectBoxComponent {
     if (!this.email.primary) {
       content.push({
         id: "destroyEmail",
-        icon: "times",
+        icon: "xmark",
         name: I18n.t("user.email.destroy"),
         description: "",
       });
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
index 00445a9a147..61d763f161a 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker.hbs
@@ -48,7 +48,7 @@
           {{on "input" (action "onFilterChange")}}
         />
 
-        {{d-icon "search"}}
+        {{d-icon "magnifying-glass"}}
       </div>
 
       <div
@@ -65,7 +65,7 @@
               <div class="section-header">
                 <span class="title">{{i18n "emoji_picker.recent"}}</span>
                 <DButton
-                  @icon="trash-alt"
+                  @icon="trash-can"
                   @action={{this.onClearRecent}}
                   class="trash-recent"
                 />
diff --git a/app/assets/javascripts/discourse/app/components/fast-edit.gjs b/app/assets/javascripts/discourse/app/components/fast-edit.gjs
index 693c7d13ec6..8cea3164bf1 100644
--- a/app/assets/javascripts/discourse/app/components/fast-edit.gjs
+++ b/app/assets/javascripts/discourse/app/components/fast-edit.gjs
@@ -76,7 +76,7 @@ export default class FastEdit extends Component {
         <DButton
           class="btn-small btn-primary save-fast-edit"
           @action={{this.save}}
-          @icon="pencil-alt"
+          @icon="pencil"
           @label="composer.save_edit"
           @translatedTitle={{this.buttonTitle}}
           @isLoading={{this.isSaving}}
diff --git a/app/assets/javascripts/discourse/app/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/components/future-date-input.hbs
index 839c1122879..9732ee59dfc 100644
--- a/app/assets/javascripts/discourse/app/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/app/components/future-date-input.hbs
@@ -17,7 +17,7 @@
 
   {{#if this.displayDateAndTimePicker}}
     <div class="control-group future-date-input-date-picker">
-      {{d-icon "calendar-alt"}}
+      {{d-icon "calendar-days"}}
       <DatePickerFuture
         @value={{this._date}}
         @defaultDate={{this._date}}
diff --git a/app/assets/javascripts/discourse/app/components/global-notice.hbs b/app/assets/javascripts/discourse/app/components/global-notice.hbs
index 1555b161459..66fd7b7a033 100644
--- a/app/assets/javascripts/discourse/app/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/app/components/global-notice.hbs
@@ -14,7 +14,7 @@
 
           {{#if notice.options.dismissable}}
             <DButton
-              @icon="times"
+              @icon="xmark"
               @action={{fn this.dismissNotice notice}}
               class="btn-transparent close"
             />
diff --git a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
index b22fe8c2428..0045931ff1d 100644
--- a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.hbs
@@ -84,7 +84,7 @@
     <DButton
       @disabled={{or this.missingSettings this.testingSettings}}
       @action={{this.testImapSettings}}
-      @icon="cog"
+      @icon="gear"
       @label="groups.manage.email.test_settings"
       @title="groups.manage.email.settings_required"
       tabindex="12"
@@ -98,7 +98,7 @@
 
     {{#if this.imapSettingsValid}}
       <span class="imap-settings-ok">
-        {{d-icon "check-circle"}}
+        {{d-icon "circle-check"}}
         {{i18n "groups.manage.email.imap_settings_valid"}}
       </span>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
index 1e398621e94..e23b38fbba2 100644
--- a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.hbs
@@ -1,7 +1,7 @@
 {{#if this.value}}
   <DButton
     @action={{fn this.clearFilter this.type}}
-    @icon="times-circle"
+    @icon="circle-xmark"
     @translatedLabel={{concat this.label ": " this.filterText}}
     class="btn-default group-manage-logs-filter"
   />
diff --git a/app/assets/javascripts/discourse/app/components/group-member-dropdown.js b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
index d47d3d42561..b95d860747c 100644
--- a/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/group-member-dropdown.js
@@ -23,7 +23,7 @@ export default class GroupMemberDropdown extends DropdownSelectBoxComponent {
         description: I18n.t("groups.members.remove_member_description", {
           username: this.get("member.username"),
         }),
-        icon: "user-times",
+        icon: "user-xmark",
       },
     ];
 
@@ -35,7 +35,7 @@ export default class GroupMemberDropdown extends DropdownSelectBoxComponent {
           description: I18n.t("groups.members.remove_owner_description", {
             username: this.get("member.username"),
           }),
-          icon: "shield-alt",
+          icon: "shield-halved",
         });
       } else {
         items.push({
@@ -44,7 +44,7 @@ export default class GroupMemberDropdown extends DropdownSelectBoxComponent {
           description: I18n.t("groups.members.make_owner_description", {
             username: this.get("member.username"),
           }),
-          icon: "shield-alt",
+          icon: "shield-halved",
         });
       }
     } else if (this.canEditGroup && !this.member.owner) {
@@ -54,7 +54,7 @@ export default class GroupMemberDropdown extends DropdownSelectBoxComponent {
         description: I18n.t("groups.members.make_owner_description", {
           username: this.get("member.username"),
         }),
-        icon: "shield-alt",
+        icon: "shield-halved",
       });
     }
 
diff --git a/app/assets/javascripts/discourse/app/components/group-member.hbs b/app/assets/javascripts/discourse/app/components/group-member.hbs
index 4bc5a78ad2f..052925f4c5d 100644
--- a/app/assets/javascripts/discourse/app/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-member.hbs
@@ -4,6 +4,6 @@
 <span>{{this.member.username}}</span>
 {{#unless this.automatic}}
   <a href {{on "click" this.remove}} class="remove">
-    {{d-icon "times"}}
+    {{d-icon "xmark"}}
   </a>
 {{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
index d86ce3ddd97..db0b3b7b65c 100644
--- a/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/group-membership-button.hbs
@@ -9,7 +9,7 @@
 {{else if this.canLeaveGroup}}
   <DButton
     @action={{action "leaveGroup"}}
-    @icon="user-times"
+    @icon="user-xmark"
     @label="groups.leave"
     @disabled={{this.updatingMembership}}
     class="btn-danger group-index-leave"
diff --git a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs
index f9ba58acb69..88ac991302a 100644
--- a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs
+++ b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs
@@ -194,7 +194,7 @@ export default class GroupSmtpEmailSettings extends Component {
 
         <form.Submit
           @disabled={{or this.testingSettings}}
-          @icon="cog"
+          @icon="gear"
           @label="groups.manage.email.test_settings"
           @title="groups.manage.email.settings_required"
           tabindex="7"
diff --git a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
index c95fcf15919..0072f9145c3 100644
--- a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
+++ b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.hbs
@@ -106,7 +106,7 @@
     />
 
     <DTooltip
-      @icon="info-circle"
+      @icon="circle-info"
       @content={{i18n "admin.groups.manage.interaction.incoming_email_tooltip"}}
     />
 
diff --git a/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs b/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs
index d76f6b402d2..a87822d8915 100644
--- a/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs
@@ -11,7 +11,7 @@ const HomeLogoContents = <template>
         @darkUrl={{@logoSmallUrlDark}}
       />
     {{else}}
-      {{icon "home"}}
+      {{icon "house"}}
     {{/if}}
   {{else if @showMobileLogo}}
     <Logo
diff --git a/app/assets/javascripts/discourse/app/components/header/icons.gjs b/app/assets/javascripts/discourse/app/components/header/icons.gjs
index a49357078c3..74708884f94 100644
--- a/app/assets/javascripts/discourse/app/components/header/icons.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/icons.gjs
@@ -67,7 +67,7 @@ export default class Icons extends Component {
           {{#unless this.hideSearchButton}}
             <Dropdown
               @title="search.title"
-              @icon="search"
+              @icon="magnifying-glass"
               @iconId={{@searchButtonId}}
               @onClick={{@toggleSearchMenu}}
               @active={{this.search.visible}}
diff --git a/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs b/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
index 2c02c69a48e..1eec5be0e7b 100644
--- a/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
@@ -15,7 +15,7 @@ export default class FeaturedLink extends Component {
         target={{this.meta.target}}
         href={{this.meta.href}}
       >
-        {{icon "external-link-alt"}}
+        {{icon "up-right-from-square"}}
         {{this.meta.domain}}
       </a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
index ef223055bc3..42b20b0ea34 100644
--- a/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/ignored-user-list-item.hbs
@@ -2,7 +2,7 @@
   <span class="ignored-user-name">{{this.item}}</span>
   <DButton
     @action={{fn (action "removeIgnoredUser") this.item}}
-    @icon="times"
+    @icon="xmark"
     class="remove-ignored-user no-text btn-icon"
   />
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/input-tip.gjs b/app/assets/javascripts/discourse/app/components/input-tip.gjs
index b663ce0f02d..6c47c813854 100644
--- a/app/assets/javascripts/discourse/app/components/input-tip.gjs
+++ b/app/assets/javascripts/discourse/app/components/input-tip.gjs
@@ -7,7 +7,7 @@ const InputTip = <template>
     ...attributes
   >
     {{#if @validation.reason}}
-      {{icon (if @validation.failed "times" "check")}}
+      {{icon (if @validation.failed "xmark" "check")}}
       {{@validation.reason}}
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/components/login-buttons.hbs
index 866e188d974..b7684227d22 100644
--- a/app/assets/javascripts/discourse/app/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/components/login-buttons.hbs
@@ -10,7 +10,7 @@
     {{else if b.icon}}
       {{d-icon b.icon}}
     {{else}}
-      {{d-icon "sign-in-alt"}}
+      {{d-icon "right-to-bracket"}}
     {{/if}}
     <span class="btn-social-title">{{b.title}}</span>
   </button>
diff --git a/app/assets/javascripts/discourse/app/components/modal/auth-token.hbs b/app/assets/javascripts/discourse/app/components/modal/auth-token.hbs
index 417b32222d9..665a6d60df6 100644
--- a/app/assets/javascripts/discourse/app/components/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/auth-token.hbs
@@ -11,7 +11,7 @@
       <h3>{{i18n "user.auth_tokens.details"}}</h3>
       <ul>
         <li>{{d-icon "far-clock"}} {{format-date @model.seen_at}}</li>
-        <li>{{d-icon "map-marker-alt"}} {{@model.location}}</li>
+        <li>{{d-icon "location-dot"}} {{@model.location}}</li>
         <li>{{d-icon @model.icon}}
           {{i18n
             "user.auth_tokens.browser_and_device"
diff --git a/app/assets/javascripts/discourse/app/components/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/components/modal/avatar-selector.hbs
index e8c82a839d6..dfd6dc4829c 100644
--- a/app/assets/javascripts/discourse/app/components/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/avatar-selector.hbs
@@ -84,7 +84,7 @@
               gravatarName=this.siteSettings.gravatar_name
             }}
             @disabled={{this.gravatarRefreshDisabled}}
-            @icon="sync"
+            @icon="arrows-rotate"
             class="btn-default avatar-selector-refresh-gravatar"
           />
 
diff --git a/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
index f0b499eefdc..0517d174d8a 100644
--- a/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
@@ -28,7 +28,7 @@
         aria-label={{i18n "post.bookmarks.name_input_label"}}
       />
       <DButton
-        @icon="cog"
+        @icon="gear"
         @action={{this.toggleShowOptions}}
         @ariaLabel="post.bookmarks.options"
         @title="post.bookmarks.options"
@@ -94,7 +94,7 @@
     <DModalCancel @close={{this.closeWithoutSavingBookmark}} />
     {{#if this.showDelete}}
       <DButton
-        @icon="trash-alt"
+        @icon="trash-can"
         @action={{this.delete}}
         @ariaLabel="post.bookmarks.actions.delete_bookmark.name"
         @title="post.bookmarks.actions.delete_bookmark.name"
diff --git a/app/assets/javascripts/discourse/app/components/modal/create-account.hbs b/app/assets/javascripts/discourse/app/components/modal/create-account.hbs
index 01c39625d76..aca31285ab9 100644
--- a/app/assets/javascripts/discourse/app/components/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/create-account.hbs
@@ -137,7 +137,7 @@
                       (unless this.capsLockOn "hidden")
                     }}
                   >
-                    {{d-icon "exclamation-triangle"}}
+                    {{d-icon "triangle-exclamation"}}
                     {{i18n "login.caps_lock_warning"}}
                   </div>
                 </div>
diff --git a/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.hbs b/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.hbs
index 4ba90c4e275..ce1ee6128d9 100644
--- a/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/customize-form-template-view.hbs
@@ -23,14 +23,14 @@
     <DButton
       class="btn-primary"
       @action={{this.editTemplate}}
-      @icon="pencil-alt"
+      @icon="pencil"
       @label="admin.form_templates.view_template.edit"
     />
     <DModalCancel @close={{@closeModal}} />
     <DButton
       class="btn-danger"
       @action={{this.deleteTemplate}}
-      @icon="trash-alt"
+      @icon="trash-can"
       @label="admin.form_templates.view_template.delete"
     />
   </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs b/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
index 54432c86a7c..54b2aaf9ea0 100644
--- a/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/discard-draft.gjs
@@ -31,7 +31,7 @@ export default class DiscardDraftModal extends Component {
 
       <:footer>
         <DButton
-          @icon="far-trash-alt"
+          @icon="trash-can"
           @label="post.cancel_composer.discard"
           @action={{this.discardDraft}}
           class="btn-danger discard-draft"
diff --git a/app/assets/javascripts/discourse/app/components/modal/flag.hbs b/app/assets/javascripts/discourse/app/components/modal/flag.hbs
index 69097cde4c8..7839d75dcb5 100644
--- a/app/assets/javascripts/discourse/app/components/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/flag.hbs
@@ -46,7 +46,7 @@
         class="btn-danger flag-modal__send-warning"
         @action={{this.createFlagAsWarning}}
         @disabled={{not this.submitEnabled}}
-        @icon="exclamation-triangle"
+        @icon="triangle-exclamation"
         @label="flagging.official_warning"
       />
     {{/if}}
@@ -63,7 +63,7 @@
         class="btn-danger flag-modal__flag-for-review"
         @action={{this.flagForReview}}
         @disabled={{not this.submitEnabled this.notifyModeratorsFlag}}
-        @icon="exclamation-triangle"
+        @icon="triangle-exclamation"
         @label="flagging.flag_for_review"
       />
     {{/if}}
@@ -73,7 +73,7 @@
         class="btn-danger delete-spammer flag-modal__delete-spammer"
         @action={{this.deleteSpammer}}
         @disabled={{not this.submitEnabled}}
-        @icon="exclamation-triangle"
+        @icon="triangle-exclamation"
         @label="flagging.delete_spammer"
       />
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/modal/forgot-password.hbs b/app/assets/javascripts/discourse/app/components/modal/forgot-password.hbs
index fb84094f263..b4c7cd70a62 100644
--- a/app/assets/javascripts/discourse/app/components/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/forgot-password.hbs
@@ -50,7 +50,7 @@
         <DButton
           @action={{this.help}}
           @label="forgot_password.button_help"
-          @icon="question-circle"
+          @icon="circle-question"
           class="btn-large"
         />
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/components/modal/history.js b/app/assets/javascripts/discourse/app/components/modal/history.js
index 404781abd4c..5698b96cf39 100644
--- a/app/assets/javascripts/discourse/app/components/modal/history.js
+++ b/app/assets/javascripts/discourse/app/components/modal/history.js
@@ -89,7 +89,7 @@ export default class History extends Component {
       "post.revisions.controls.comparing_previous_to_current_out_of_total",
       {
         previous: this.previousVersion,
-        icon: iconHTML("arrows-alt-h"),
+        icon: iconHTML("left-right"),
         current: this.postRevision?.current_version,
         total: this.postRevision?.version_count,
       }
diff --git a/app/assets/javascripts/discourse/app/components/modal/history/revision.hbs b/app/assets/javascripts/discourse/app/components/modal/history/revision.hbs
index 5612570029c..09bf28886ad 100644
--- a/app/assets/javascripts/discourse/app/components/modal/history/revision.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/history/revision.hbs
@@ -1,6 +1,6 @@
 <div id="revision">
   <div id="revision-details">
-    {{d-icon "pencil-alt"}}
+    {{d-icon "pencil"}}
     <LinkTo
       @route="user"
       @model={{@model.username}}
@@ -36,14 +36,14 @@
 
         {{#if @model.wiki_changes}}
           {{d-icon
-            "far-edit"
+            "far-pen-to-square"
             class=(if @model.wiki_changes.current "diff-ins" "diff-del")
           }}
         {{/if}}
 
         {{#if @model.post_type_changes}}
           {{d-icon
-            "shield-alt"
+            "shield-halved"
             class=(if
               (eq
                 @model.post_type_changes.current
@@ -111,7 +111,7 @@
             title={{i18n "post.revisions.displays.side_by_side.title"}}
             aria-label={{i18n "post.revisions.displays.side_by_side.title"}}
           >
-            {{d-icon "columns"}}
+            {{d-icon "table-columns"}}
             {{i18n "post.revisions.displays.side_by_side.button"}}
           </a>
         </li>
@@ -128,7 +128,7 @@
               "post.revisions.displays.side_by_side_markdown.title"
             }}
           >
-            {{d-icon "columns"}}
+            {{d-icon "table-columns"}}
             {{i18n "post.revisions.displays.side_by_side_markdown.button"}}
           </a>
         </li>
diff --git a/app/assets/javascripts/discourse/app/components/modal/history/revisions.hbs b/app/assets/javascripts/discourse/app/components/modal/history/revisions.hbs
index d61d0fce6f8..ea47b790e7e 100644
--- a/app/assets/javascripts/discourse/app/components/modal/history/revisions.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/history/revisions.hbs
@@ -23,7 +23,7 @@
     {{#if @model.wiki_changes}}
       <div class="row">
         {{d-icon
-          "far-edit"
+          "far-pen-to-square"
           class=(if @model.wiki_changes.current "diff-ins" "diff-del")
         }}
       </div>
diff --git a/app/assets/javascripts/discourse/app/components/modal/history/topic-footer.hbs b/app/assets/javascripts/discourse/app/components/modal/history/topic-footer.hbs
index 97f18c9f839..398fa1163ec 100644
--- a/app/assets/javascripts/discourse/app/components/modal/history/topic-footer.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/history/topic-footer.hbs
@@ -3,7 +3,7 @@
     <DButton
       class="btn-default first-revision"
       @action={{@loadFirstVersion}}
-      @icon="fast-backward"
+      @icon="backward-fast"
       @title="post.revisions.controls.first"
       @disabled={{@loadFirstDisabled}}
     />
@@ -31,7 +31,7 @@
     <DButton
       class="btn-default last-revision"
       @action={{@loadLastVersion}}
-      @icon="fast-forward"
+      @icon="forward-fast"
       @title="post.revisions.controls.last"
       @disabled={{@loadLastDisabled}}
     />
@@ -42,7 +42,7 @@
   {{#if @displayEdit}}
     <DButton
       @action={{@editPost}}
-      @icon="pencil-alt"
+      @icon="pencil"
       class="btn-default edit-post"
       @label={{@editButtonLabel}}
     />
@@ -52,7 +52,7 @@
     {{#if @revertToRevisionText}}
       <DButton
         @action={{@revertToVersion}}
-        @icon="undo"
+        @icon="arrow-rotate-left"
         @translatedLabel={{@revertToRevisionText}}
         class="btn-danger revert-to-version"
         @disabled={{@loading}}
@@ -80,7 +80,7 @@
     {{#if (and @canPermanentlyDelete @model.previous_hidden)}}
       <DButton
         @action={{@permanentlyDeleteVersions}}
-        @icon="far-trash-alt"
+        @icon="trash-can"
         @label="post.revisions.controls.destroy"
         class="btn-danger destroy-revision"
         @disabled={{@loading}}
diff --git a/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.js b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.js
index ca58dedfa7e..ebdb2d22839 100644
--- a/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.js
+++ b/app/assets/javascripts/discourse/app/components/modal/json-schema-editor.js
@@ -68,7 +68,7 @@ export default class JsonSchemaEditorModal extends Component {
 class DiscourseJsonSchemaEditorIconlib {
   constructor() {
     this.mapping = {
-      delete: "trash-alt",
+      delete: "trash-can",
       add: "plus",
       moveup: "arrow-up",
       movedown: "arrow-down",
diff --git a/app/assets/javascripts/discourse/app/components/modal/login/local-login-form.hbs b/app/assets/javascripts/discourse/app/components/modal/login/local-login-form.hbs
index 48a05b37df9..6a4e7cc65f4 100644
--- a/app/assets/javascripts/discourse/app/components/modal/login/local-login-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/login/local-login-form.hbs
@@ -64,7 +64,7 @@
         {{/if}}
       </div>
       <div class="caps-lock-warning {{unless this.capsLockOn 'hidden'}}">
-        {{d-icon "exclamation-triangle"}}
+        {{d-icon "triangle-exclamation"}}
         {{i18n "login.caps_lock_warning"}}</div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/app/components/modal/move-to-topic.hbs
index 5a395787e41..db9922572e4 100644
--- a/app/assets/javascripts/discourse/app/components/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/move-to-topic.hbs
@@ -254,7 +254,7 @@
       class="btn-primary"
       @disabled={{this.buttonDisabled}}
       @action={{this.performMove}}
-      @icon="sign-out-alt"
+      @icon="right-from-bracket"
       @label={{this.buttonTitle}}
     />
   </:footer>
diff --git a/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
index 71ec1fc99ce..96b4edba810 100644
--- a/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/publish-page.hbs
@@ -74,14 +74,14 @@
     {{#if this.showUnpublish}}
       <DButton
         @label="topic.publish_page.unpublish"
-        @icon="trash-alt"
+        @icon="trash-can"
         @isLoading={{this.unpublishing}}
         @action={{this.unpublish}}
         class="btn-danger"
       />
 
       <DButton
-        @icon="times"
+        @icon="xmark"
         @label="close"
         @action={{@closeModal}}
         class="close-publish-page"
diff --git a/app/assets/javascripts/discourse/app/components/modal/reject-reason-reviewable.hbs b/app/assets/javascripts/discourse/app/components/modal/reject-reason-reviewable.hbs
index 5ad56ef8e00..b5eaa52ab6b 100644
--- a/app/assets/javascripts/discourse/app/components/modal/reject-reason-reviewable.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/reject-reason-reviewable.hbs
@@ -20,7 +20,7 @@
 
   <:footer>
     <DButton
-      @icon="trash-alt"
+      @icon="trash-can"
       @action={{this.perform}}
       @label="admin.user.delete"
       class="btn-danger"
diff --git a/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.hbs
index 66b315c86d3..a597e5ebe02 100644
--- a/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/second-factor-backup-edit.hbs
@@ -42,7 +42,7 @@
       {{#if this.backupEnabled}}
         <DButton
           class="btn-primary"
-          @icon="redo"
+          @icon="arrow-rotate-right"
           @action={{this.generateSecondFactorCodes}}
           @type="submit"
           @isLoading={{this.loading}}
diff --git a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
index fbec1f648fa..912930d72b6 100644
--- a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
@@ -126,7 +126,7 @@
               class="always-public-tooltip"
             >
               <:trigger>
-                {{d-icon "check-square"}}
+                {{d-icon "square-check"}}
                 <span>{{i18n "sidebar.sections.custom.public"}}</span>
               </:trigger>
             </DTooltip>
@@ -144,7 +144,7 @@
     {{/if}}
     {{#if this.canDelete}}
       <DButton
-        @icon="trash-alt"
+        @icon="trash-can"
         @action={{this.delete}}
         @label="sidebar.sections.custom.delete"
         @ariaLabel="sidebar.sections.custom.delete"
@@ -155,7 +155,7 @@
     {{#if this.transformedModel.sectionType}}
       <DButton
         @action={{this.resetToDefault}}
-        @icon="undo"
+        @icon="arrow-rotate-left"
         @title="sidebar.sections.custom.links.reset"
         @label="sidebar.sections.custom.links.reset"
         @ariaLabel="sidebar.sections.custom.links.reset"
diff --git a/app/assets/javascripts/discourse/app/components/modal/spreadsheet-editor.gjs b/app/assets/javascripts/discourse/app/components/modal/spreadsheet-editor.gjs
index 7fc40c611d5..491388a91d9 100644
--- a/app/assets/javascripts/discourse/app/components/modal/spreadsheet-editor.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/spreadsheet-editor.gjs
@@ -46,7 +46,7 @@ export default class SpreadsheetEditor extends Component {
         title: "table_builder.edit.modal.title",
         insertTable: {
           title: "table_builder.edit.modal.create",
-          icon: "pencil-alt",
+          icon: "pencil",
         },
       };
     } else {
@@ -380,7 +380,7 @@ export default class SpreadsheetEditor extends Component {
             {{#if this.isEditingTable}}
               <div class="edit-reason">
                 <DButton
-                  @icon="info-circle"
+                  @icon="circle-info"
                   @title="table_builder.edit.modal.trigger_reason"
                   @action={{this.showEditReasonField}}
                   class="btn-edit-reason"
diff --git a/app/assets/javascripts/discourse/app/components/modal/user-status.hbs b/app/assets/javascripts/discourse/app/components/modal/user-status.hbs
index fdf1388203e..096a7fc52e5 100644
--- a/app/assets/javascripts/discourse/app/components/modal/user-status.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/user-status.hbs
@@ -45,7 +45,7 @@
 
     {{#if this.showDeleteButton}}
       <DButton
-        @icon="trash-alt"
+        @icon="trash-can"
         @action={{this.delete}}
         class="delete-status btn-danger"
       />
diff --git a/app/assets/javascripts/discourse/app/components/notification-consent-banner.gjs b/app/assets/javascripts/discourse/app/components/notification-consent-banner.gjs
index 1662a5d82a9..6392f70f52e 100644
--- a/app/assets/javascripts/discourse/app/components/notification-consent-banner.gjs
+++ b/app/assets/javascripts/discourse/app/components/notification-consent-banner.gjs
@@ -67,7 +67,7 @@ export default class NotificationConsentBanner extends Component {
             />
           </span>
           <DButton
-            @icon="times"
+            @icon="xmark"
             @action={{this.dismiss}}
             @title="banner.close"
             class="btn-transparent close"
diff --git a/app/assets/javascripts/discourse/app/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/app/components/popup-input-tip.hbs
index ce4fafd02bc..851c22a01cc 100644
--- a/app/assets/javascripts/discourse/app/components/popup-input-tip.hbs
+++ b/app/assets/javascripts/discourse/app/components/popup-input-tip.hbs
@@ -1 +1 @@
-{{this.tipReason}} {{d-icon "times-circle"}}
\ No newline at end of file
+{{this.tipReason}} {{d-icon "circle-xmark"}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/post-text-selection-toolbar.gjs b/app/assets/javascripts/discourse/app/components/post-text-selection-toolbar.gjs
index 7e2c955c441..2e3c680850c 100644
--- a/app/assets/javascripts/discourse/app/components/post-text-selection-toolbar.gjs
+++ b/app/assets/javascripts/discourse/app/components/post-text-selection-toolbar.gjs
@@ -225,7 +225,7 @@ export default class PostTextSelectionToolbar extends Component {
 
           {{#if @data.canEditPost}}
             <DButton
-              @icon="pencil-alt"
+              @icon="pencil"
               @label="post.quote_edit"
               @title="post.quote_edit_shortcut"
               class="btn-flat quote-edit-label"
diff --git a/app/assets/javascripts/discourse/app/components/pwa-install-banner.gjs b/app/assets/javascripts/discourse/app/components/pwa-install-banner.gjs
index 450d3db0828..c62794a90b2 100644
--- a/app/assets/javascripts/discourse/app/components/pwa-install-banner.gjs
+++ b/app/assets/javascripts/discourse/app/components/pwa-install-banner.gjs
@@ -70,7 +70,7 @@ export default class PwaInstallBanner extends Component {
           />
         </span>
         <DButton
-          @icon="times"
+          @icon="xmark"
           @action={{this.dismiss}}
           @title="banner.close"
           class="btn-transparent close"
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.gjs b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.gjs
index cb39c68b2a6..35f0f58301f 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.gjs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-claimed-topic.gjs
@@ -48,7 +48,7 @@ export default class ReviewableClaimedTopic extends Component {
             <span class="claimed-username">{{@claimedBy.username}}</span>
           </div>
           <DButton
-            @icon="times"
+            @icon="xmark"
             @action={{this.unclaim}}
             @title="review.unclaim.help"
             class="btn-small unclaim"
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs b/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs
index d3e96f92f0f..7a6a9a30184 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs
@@ -7,7 +7,7 @@ const ReviewableCreatedBy = <template>
     {{#if @user}}
       <UserLink @user={{@user}}>{{avatar @user imageSize="large"}}</UserLink>
     {{else}}
-      {{icon "far-trash-alt" class="deleted-user-avatar"}}
+      {{icon "trash-can" class="deleted-user-avatar"}}
     {{/if}}
   </div>
 </template>;
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
index fbe2b07647f..f8587d6e2ab 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.hbs
@@ -27,7 +27,7 @@
       title={{i18n "review.explain.why"}}
       class="explain"
     >
-      {{d-icon "question-circle"}}
+      {{d-icon "circle-question"}}
     </a>
   </div>
 
@@ -82,7 +82,7 @@
           />
           <DButton
             @disabled={{this.disabled}}
-            @icon="times"
+            @icon="xmark"
             @action={{action "cancelEdit"}}
             @label="review.cancel"
             class="btn-danger reviewable-action cancel-edit"
@@ -99,7 +99,7 @@
           {{#if this.reviewable.can_edit}}
             <DButton
               @disabled={{this.disabled}}
-              @icon="pencil-alt"
+              @icon="pencil"
               @action={{action "edit"}}
               @label="review.edit"
               class="reviewable-action btn-default edit"
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs
index e09ccdde80f..2bdce30f2ed 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-post-edits.hbs
@@ -5,6 +5,6 @@
     class="has-edits {{this.historyClass}}"
     title={{i18n "post.last_edited_on" dateTime=this.editedDate}}
   >
-    {{d-icon "pencil-alt"}}
+    {{d-icon "pencil"}}
   </a>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
index 2cfbfb7d077..24a107150bb 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-queued-post.hbs
@@ -1,6 +1,6 @@
 <ReviewableTopicLink @reviewable={{@reviewable}} @tagName="">
   <div class="title-text">
-    {{d-icon "plus-square" title="review.new_topic"}}
+    {{d-icon "square-plus" title="review.new_topic"}}
     {{@reviewable.payload.title}}
   </div>
   {{category-badge @reviewable.category}}
diff --git a/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
index 4dea66359ce..5930dc95fdc 100644
--- a/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-advanced-options.hbs
@@ -248,7 +248,7 @@
           aria-label={{i18n "search.advanced.post.min.aria_label"}}
           {{on "input" (with-event-value this.onChangeSearchTermMinPostCount)}}
         />
-        {{d-icon "arrows-alt-h"}}
+        {{d-icon "left-right"}}
         <Input
           @type="number"
           @value={{readonly this.searchedTerms.max_posts}}
@@ -274,7 +274,7 @@
           aria-label={{i18n "search.advanced.min_views.aria_label"}}
           {{on "input" (with-event-value this.onChangeSearchTermMinViews)}}
         />
-        {{d-icon "arrows-alt-h"}}
+        {{d-icon "left-right"}}
         <Input
           @type="number"
           @value={{readonly this.searchedTerms.max_views}}
@@ -292,7 +292,7 @@
     <div class="second-search-button">
       <DButton
         @action={{this.search}}
-        @icon="search"
+        @icon="magnifying-glass"
         @label="search.search_button"
         @ariaLabel="search.search_button"
         @disabled={{this.searchButtonDisabled}}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu.hbs b/app/assets/javascripts/discourse/app/components/search-menu.hbs
index 7bdf891ffbb..9bc89954b24 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu.hbs
@@ -2,7 +2,7 @@
   <div class="search-input">
     {{#if this.search.inTopicContext}}
       <DButton
-        @icon="times"
+        @icon="xmark"
         @label="search.in_this_topic"
         @title="search.in_this_topic_tooltip"
         @action={{this.clearTopicContext}}
@@ -10,7 +10,7 @@
       />
     {{else if this.inPMInboxContext}}
       <DButton
-        @icon="times"
+        @icon="xmark"
         @label="search.in_messages"
         @title="search.in_messages_tooltip"
         @action={{this.clearPMInboxContext}}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs b/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
index 7b46dfbaf9a..4fa0d4aec7a 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
@@ -2,5 +2,5 @@
   class="show-advanced-search"
   title={{i18n "search.open_advanced"}}
   @action={{@openAdvancedSearch}}
-  @icon="sliders-h"
+  @icon="sliders"
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/clear-button.hbs b/app/assets/javascripts/discourse/app/components/search-menu/clear-button.hbs
index 0b3b2dce015..bfc9b6ad723 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/clear-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/clear-button.hbs
@@ -5,5 +5,5 @@
   href
   {{on "click" @clearSearch}}
 >
-  {{d-icon "times"}}
+  {{d-icon "xmark"}}
 </a>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.hbs
index c94ff2d72b6..f9c10ea849d 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.hbs
@@ -8,7 +8,7 @@
 >
   <a class="search-link" href={{this.href}}>
     <span aria-label={{i18n "search.title"}}>
-      {{d-icon (or @icon "search")}}
+      {{d-icon (or @icon "magnifying-glass")}}
     </span>
 
     {{#if this.prefix}}
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.js b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.js
index f33a7f2a7d4..d6202fc0cf5 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.js
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/assistant-item.js
@@ -18,7 +18,7 @@ export default class AssistantItem extends Component {
   @service search;
   @service appEvents;
 
-  icon = this.args.icon || "search";
+  icon = this.args.icon || "magnifying-glass";
 
   get href() {
     let href = "#";
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.hbs
index 02a6d325fc1..bb0381202af 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/recent-searches.hbs
@@ -4,7 +4,7 @@
       <h4>{{i18n "search.recent"}}</h4>
       <FlatButton
         @title="search.clear_recent"
-        @icon="times"
+        @icon="xmark"
         @action={{this.clearRecent}}
         class="clear-recent-searches"
       />
@@ -12,7 +12,7 @@
 
     {{#each this.currentUser.recent_searches as |slug|}}
       <SearchMenu::Results::AssistantItem
-        @icon="history"
+        @icon="clock-rotate-left"
         @label={{slug}}
         @slug={{slug}}
         @closeSearchMenu={{@closeSearchMenu}}
diff --git a/app/assets/javascripts/discourse/app/components/security-key-dropdown.js b/app/assets/javascripts/discourse/app/components/security-key-dropdown.js
index c0404e92dbf..ce9069d3d0c 100644
--- a/app/assets/javascripts/discourse/app/components/security-key-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/security-key-dropdown.js
@@ -16,13 +16,13 @@ export default class SecurityKeyDropdown extends DropdownSelectBoxComponent {
 
     content.push({
       id: "edit",
-      icon: "pencil-alt",
+      icon: "pencil",
       name: I18n.t("user.second_factor.edit"),
     });
 
     content.push({
       id: "disable",
-      icon: "trash-alt",
+      icon: "trash-can",
       name: I18n.t("user.second_factor.disable"),
     });
 
diff --git a/app/assets/javascripts/discourse/app/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/components/selected-posts.hbs
index 0c86bc28688..04d92e1f323 100644
--- a/app/assets/javascripts/discourse/app/components/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/app/components/selected-posts.hbs
@@ -24,7 +24,7 @@
 {{#if this.canDeleteSelected}}
   <DButton
     @action={{this.deleteSelected}}
-    @icon="far-trash-alt"
+    @icon="trash-can"
     @label="topic.multi_select.delete"
     class="btn-danger"
   />
@@ -33,7 +33,7 @@
 {{#if this.canMergeTopic}}
   <DButton
     @action={{route-action "moveToTopic"}}
-    @icon="sign-out-alt"
+    @icon="right-from-bracket"
     @label="topic.move_to.action"
     class="btn-primary move-to-topic"
   />
@@ -51,7 +51,7 @@
 {{#if this.canMergePosts}}
   <DButton
     @action={{this.mergePosts}}
-    @icon="arrows-alt-v"
+    @icon="up-down"
     @label="topic.merge_posts.action"
     class="btn-primary"
   />
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs
index 9c002dd3ca8..57992408f80 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs
@@ -74,7 +74,7 @@ export default class SidebarEditNavigationMenuModal extends Component {
         <div class="sidebar__edit-navigation-menu__filter">
           <div class="sidebar__edit-navigation-menu__filter-input">
             {{icon
-              "search"
+              "magnifying-glass"
               class="sidebar__edit-navigation-menu__filter-input-icon"
             }}
 
@@ -118,7 +118,7 @@ export default class SidebarEditNavigationMenuModal extends Component {
             <DButton
               @action={{@resetToDefaults}}
               @label="sidebar.edit_navigation_modal_form.reset_to_defaults"
-              @icon="undo"
+              @icon="arrow-rotate-left"
               @disabled={{@saving}}
               class="btn-flat btn-text sidebar__edit-navigation-menu__reset-defaults-button"
             />
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/filter.gjs b/app/assets/javascripts/discourse/app/components/sidebar/filter.gjs
index ad51377a1c8..ed3027d124b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/filter.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/filter.gjs
@@ -76,7 +76,7 @@ export default class Filter extends Component {
           {{#if this.displayClearFilter}}
             <DButton
               @action={{this.clearFilter}}
-              @icon="times"
+              @icon="xmark"
               class="sidebar-filter__clear"
             />
           {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/footer.gjs b/app/assets/javascripts/discourse/app/components/sidebar/footer.gjs
index 83fc442eba8..a920c6003a4 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/footer.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/footer.gjs
@@ -61,7 +61,7 @@ export default class SidebarFooter extends Component {
             <DButton
               @action={{this.toggleMobileView}}
               @title={{if this.site.mobileView "desktop_view" "mobile_view"}}
-              @icon={{if this.site.mobileView "desktop" "mobile-alt"}}
+              @icon={{if this.site.mobileView "desktop" "mobile-screen-button"}}
               class="btn-flat sidebar-footer-actions-button sidebar-footer-actions-toggle-mobile-view"
             />
           {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs
index 87f5046d9a5..9de86f9e318 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs
@@ -129,7 +129,7 @@ export default class SidebarMoreSectionLinks extends Component {
         class="sidebar-section-link sidebar-row sidebar-more-section-links-details-summary --link-button"
       >
         <span class="sidebar-section-link-prefix icon">
-          {{icon "ellipsis-v"}}
+          {{icon "ellipsis-vertical"}}
         </span>
         <span class="sidebar-section-link-content-text">
           {{i18n "sidebar.more"}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs
index 96d85defdd3..48cf1e72f7f 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs
@@ -158,7 +158,7 @@ export default class SectionFormLink extends Component {
       </div>
 
       <DButton
-        @icon="trash-alt"
+        @icon="trash-can"
         @action={{fn @deleteLink @link}}
         @title="sidebar.sections.custom.links.delete"
         role="cell"
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section.gjs b/app/assets/javascripts/discourse/app/components/sidebar/section.gjs
index 6dc98df97fa..8cab30d165b 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section.gjs
@@ -199,7 +199,7 @@ export default class SidebarSection extends Component {
                   <span
                     class="sidebar-section-header-global-indicator__content"
                   >
-                    {{icon "shield-alt"}}
+                    {{icon "shield-halved"}}
                     {{i18n "sidebar.sections.global_section"}}
                   </span>
                 </DTooltip>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/toggle-all-sections.gjs b/app/assets/javascripts/discourse/app/components/sidebar/toggle-all-sections.gjs
index 6c3ae0610d6..ec14de569c0 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/toggle-all-sections.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/toggle-all-sections.gjs
@@ -29,7 +29,7 @@ export default class ToggleAllSections extends Component {
   }
 
   get icon() {
-    return this.allSectionsExpanded ? "angle-double-up" : "angle-double-down";
+    return this.allSectionsExpanded ? "angles-up" : "angles-down";
   }
 
   @action
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.gjs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.gjs
index 666fe7d01ef..b26a388aeed 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.gjs
@@ -82,7 +82,7 @@ export default class SidebarUserCategoriesSection extends CommonCategoriesSectio
           title=(i18n "sidebar.sections.categories.header_action_title")
         )
       }}
-      @headerActionsIcon="pencil-alt"
+      @headerActionsIcon="pencil"
       @collapsable={{@collapsable}}
     >
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.gjs b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.gjs
index 2d36ee5f697..9c2a6d5e2f8 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.gjs
@@ -94,7 +94,7 @@ export default class SidebarUserTagsSection extends Component {
           title=(i18n "sidebar.sections.tags.header_action_title")
         )
       }}
-      @headerActionsIcon="pencil-alt"
+      @headerActionsIcon="pencil"
       @collapsable={{@collapsable}}
     >
       {{#each this.sectionLinks as |sectionLink|}}
diff --git a/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs b/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
index 3a59520de10..84106da8ae1 100644
--- a/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/slow-mode-info.hbs
@@ -9,7 +9,7 @@
       {{#if this.user.canManageTopic}}
         <DButton
           @action={{this.disableSlowMode}}
-          @icon="trash-alt"
+          @icon="trash-can"
           class="slow-mode-remove"
         />
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/software-update-prompt.gjs b/app/assets/javascripts/discourse/app/components/software-update-prompt.gjs
index 8c29bdc965d..a264ed783cc 100644
--- a/app/assets/javascripts/discourse/app/components/software-update-prompt.gjs
+++ b/app/assets/javascripts/discourse/app/components/software-update-prompt.gjs
@@ -96,7 +96,7 @@ export default class SoftwareUpdatePrompt extends Component {
           <div aria-live="polite" class="update-prompt-main-content">
             <DButton
               @action={{this.refreshPage}}
-              @icon="redo"
+              @icon="arrow-rotate-right"
               @label="software_update_prompt.message"
               class="btn-transparent update-prompt-message"
             />
@@ -104,7 +104,7 @@ export default class SoftwareUpdatePrompt extends Component {
             <span class="update-prompt-dismiss">
               <DButton
                 @action={{this.dismiss}}
-                @icon="times"
+                @icon="xmark"
                 aria-label={{i18n "software_update_prompt.dismiss"}}
                 class="btn-transparent"
               />
diff --git a/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
index e5d51636a98..acd0fd98761 100644
--- a/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/tag-groups-form.hbs
@@ -127,7 +127,7 @@
   <DButton
     @action={{this.destroyTagGroup}}
     @disabled={{this.buffered.isNew}}
-    @icon="far-trash-alt"
+    @icon="trash-can"
     @label="tagging.groups.delete"
     class="btn-danger"
   />
diff --git a/app/assets/javascripts/discourse/app/components/tag-info.hbs b/app/assets/javascripts/discourse/app/components/tag-info.hbs
index 148b1246600..13bbeb7f98f 100644
--- a/app/assets/javascripts/discourse/app/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/tag-info.hbs
@@ -31,7 +31,7 @@
             {{/unless}}
             <DButton
               @action={{action "cancelEditing"}}
-              @icon="times"
+              @icon="xmark"
               @ariaLabel="cancel"
               class="btn-default cancel-edit"
             />
@@ -46,7 +46,7 @@
               {{on "click" this.edit}}
               class="edit-tag"
               title={{i18n "tagging.edit_tag"}}
-            >{{d-icon "pencil-alt"}}</a>
+            >{{d-icon "pencil"}}</a>
           {{/if}}
         </div>
         {{#if this.tagInfo.description}}
@@ -96,14 +96,14 @@
                   {{on "click" (fn this.unlinkSynonym tag)}}
                   class="unlink-synonym"
                 >
-                  {{d-icon "unlink" title="tagging.remove_synonym"}}
+                  {{d-icon "link-slash" title="tagging.remove_synonym"}}
                 </a>
                 <a
                   href
                   {{on "click" (fn this.deleteSynonym tag)}}
                   class="delete-synonym"
                 >
-                  {{d-icon "far-trash-alt" title="tagging.delete_tag"}}
+                  {{d-icon "trash-can" title="tagging.delete_tag"}}
                 </a>
               {{/if}}
             </div>
@@ -146,7 +146,7 @@
       <div class="tag-actions">
         <DButton
           @action={{action "toggleEditControls"}}
-          @icon="cog"
+          @icon="gear"
           @label="tagging.edit_synonyms"
           id="edit-synonyms"
           class="btn-default"
@@ -154,7 +154,7 @@
         {{#if this.canAdminTag}}
           <DButton
             @action={{action "deleteTag"}}
-            @icon="far-trash-alt"
+            @icon="trash-can"
             @label="tagging.delete_tag"
             id="delete-tag"
             class="btn-danger delete-tag"
diff --git a/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
index 8826ea5861c..f97ef36d860 100644
--- a/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/tags-admin-dropdown.js
@@ -35,7 +35,7 @@ export default class TagsAdminDropdown extends DropdownSelectBoxComponent {
         id: "deleteUnusedTags",
         name: I18n.t("tagging.delete_unused"),
         description: I18n.t("tagging.delete_unused_description"),
-        icon: "trash-alt",
+        icon: "trash-can",
       },
     ];
   }
diff --git a/app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
index 84dba0a8106..a96619dae3a 100644
--- a/app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
+++ b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
@@ -16,7 +16,7 @@
       {{#if this.customDatetimeSelected}}
         <div class="control-group custom-date-time-wrap custom-input-wrap">
           <div class="tap-tile-date-input">
-            {{d-icon "calendar-alt"}}
+            {{d-icon "calendar-days"}}
             <DatePickerFuture
               @value={{this.customDate}}
               @defaultDate={{this.defaultCustomDate}}
diff --git a/app/assets/javascripts/discourse/app/components/token-based-auth-dropdown.js b/app/assets/javascripts/discourse/app/components/token-based-auth-dropdown.js
index 3e9c454e50a..fe440ae4945 100644
--- a/app/assets/javascripts/discourse/app/components/token-based-auth-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/token-based-auth-dropdown.js
@@ -15,12 +15,12 @@ export default class TokenBasedAuthDropdown extends DropdownSelectBoxComponent {
     return [
       {
         id: "edit",
-        icon: "pencil-alt",
+        icon: "pencil",
         name: I18n.t("user.second_factor.edit"),
       },
       {
         id: "disable",
-        icon: "trash-alt",
+        icon: "trash-can",
         name: I18n.t("user.second_factor.disable"),
       },
     ];
diff --git a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
index fa1284f2818..4899bc4e6c8 100644
--- a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
@@ -108,7 +108,7 @@ export default class TopicAdminMenu extends Component {
                       class="btn-transparent"
                       @label="topic.actions.multi_select"
                       @action={{fn this.onButtonAction "toggleMultiSelect"}}
-                      @icon="tasks"
+                      @icon="list-check"
                     />
                   </dropdown.item>
                 {{/if}}
@@ -124,7 +124,7 @@ export default class TopicAdminMenu extends Component {
                       <DButton
                         @label="topic.actions.delete"
                         @action={{fn this.onButtonAction "deleteTopic"}}
-                        @icon="far-trash-alt"
+                        @icon="trash-can"
                         class="popup-menu-btn-danger btn-danger btn-transparent"
                       />
                     </dropdown.item>
@@ -134,7 +134,7 @@ export default class TopicAdminMenu extends Component {
                         class="btn-transparent"
                         @label="topic.actions.recover"
                         @action={{fn this.onButtonAction "recoverTopic"}}
-                        @icon="undo"
+                        @icon="arrow-rotate-left"
                       />
                     </dropdown.item>
                   {{/if}}
@@ -256,7 +256,7 @@ export default class TopicAdminMenu extends Component {
                         class="btn-transparent"
                         @label="topic.change_timestamp.title"
                         @action={{fn this.onButtonAction "showChangeTimestamp"}}
-                        @icon="calendar-alt"
+                        @icon="calendar-days"
                       />
                     </dropdown.item>
                   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
index 3bc79368744..f8f06588f13 100644
--- a/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-entrance.hbs
@@ -7,7 +7,7 @@
   title={{i18n "topic_entrance.jump_top_button_title"}}
   class="btn-default full jump-top"
 >
-  {{d-icon "step-backward"}}
+  {{d-icon "backward-step"}}
   {{html-safe this.topDate}}
 </DButton>
 
@@ -21,5 +21,5 @@
   class="btn-default full jump-bottom"
 >
   {{html-safe this.bottomDate}}
-  {{d-icon "step-forward"}}
+  {{d-icon "forward-step"}}
 </DButton>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/topic-entrance.gjs b/app/assets/javascripts/discourse/app/components/topic-list/topic-entrance.gjs
index 98b51804a10..329dc4153e4 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/topic-entrance.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/topic-entrance.gjs
@@ -88,7 +88,7 @@ export default class TopicEntrance extends Component {
             title={{i18n "topic_entrance.jump_top_button_title"}}
             class="btn btn-default full jump-top"
           >
-            {{icon "step-backward"}}
+            {{icon "backward-step"}}
             {{htmlSafe this.topDate}}
           </button>
 
@@ -102,7 +102,7 @@ export default class TopicEntrance extends Component {
             class="btn btn-default full jump-bottom"
           >
             {{htmlSafe this.bottomDate}}
-            {{icon "step-forward"}}
+            {{icon "forward-step"}}
           </button>
         </div>
       </:content>
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header-column.gjs b/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header-column.gjs
index bd9bacfd4c6..3bdeaf02dad 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header-column.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header-column.gjs
@@ -88,7 +88,7 @@ export default class TopicListHeaderColumn extends Component {
             title={{i18n "topics.bulk.toggle"}}
             class="btn-flat bulk-select"
           >
-            {{icon "tasks"}}
+            {{icon "list-check"}}
           </button>
         {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header.gjs b/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header.gjs
index ef3a2ab6feb..3d8b373badc 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/topic-list-header.gjs
@@ -16,7 +16,7 @@ const TopicListHeader = <template>
             title={{i18n "topics.bulk.toggle"}}
             class="btn-flat bulk-select"
           >
-            {{icon "tasks"}}
+            {{icon "list-check"}}
           </button>
         {{/if}}
       </th>
diff --git a/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs b/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs
index 2df6ef3c353..93186779e19 100644
--- a/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs
@@ -140,7 +140,7 @@ class PmRemoveGroupLink extends Component {
     <DButton
       class="remove-invited"
       @action={{this.showConfirmDialog}}
-      @icon="times"
+      @icon="xmark"
     />
   </template>
 }
@@ -209,7 +209,7 @@ class PmRemoveLink extends Component {
     <DButton
       class="remove-invited"
       @action={{this.showConfirmDialog}}
-      @icon="times"
+      @icon="xmark"
     />
   </template>
 }
diff --git a/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs b/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs
index a2d4014a8a0..3d379249ffe 100644
--- a/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs
@@ -78,7 +78,7 @@ export default class TopicMapSummary extends Component {
   }
 
   get topRepliesIcon() {
-    return this.topRepliesSummaryEnabled ? "arrows-alt-v" : "layer-group";
+    return this.topRepliesSummaryEnabled ? "up-down" : "layer-group";
   }
 
   get topRepliesLabel() {
diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs b/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
index 3d88ac3496c..c7fb4f3c9fb 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation-popup.hbs
@@ -1,6 +1,6 @@
 {{#unless this.hidden}}
   <div class="topic-navigation-popup">
-    <DButton @action={{this.close}} @icon="times" class="close btn-flat" />
+    <DButton @action={{this.close}} @icon="xmark" class="close btn-flat" />
     {{yield}}
   </div>
 {{/unless}}
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
index 37654880179..bc7000fd324 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/app/components/topic-timer-info.hbs
@@ -8,7 +8,7 @@
       {{#if this.showEdit}}
         <DButton
           @title="post.controls.edit_timer"
-          @icon="pencil-alt"
+          @icon="pencil"
           @action={{this.showTopicTimerModal}}
           class="topic-timer-edit no-text"
         />
@@ -16,7 +16,7 @@
       {{#if this.showTrashCan}}
         <DButton
           @title="post.controls.remove_timer"
-          @icon="trash-alt"
+          @icon="trash-can"
           @action={{this.removeTopicTimer}}
           class="topic-timer-remove no-text"
         />
diff --git a/app/assets/javascripts/discourse/app/components/two-factor-backup-dropdown.js b/app/assets/javascripts/discourse/app/components/two-factor-backup-dropdown.js
index f44730d8260..4032df92364 100644
--- a/app/assets/javascripts/discourse/app/components/two-factor-backup-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/two-factor-backup-dropdown.js
@@ -16,14 +16,14 @@ export default class TwoFactorBackupDropdown extends DropdownSelectBoxComponent
 
     content.push({
       id: "edit",
-      icon: "pencil-alt",
+      icon: "pencil",
       name: I18n.t("user.second_factor.edit"),
     });
 
     if (this.secondFactorBackupEnabled) {
       content.push({
         id: "disable",
-        icon: "trash-alt",
+        icon: "trash-can",
         name: I18n.t("user.second_factor.disable"),
       });
     }
diff --git a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
index 1683f423e33..fa1f844e1f3 100644
--- a/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/components/uppy-image-uploader.hbs
@@ -21,7 +21,7 @@
     {{#if this.imageUrl}}
       <DButton
         @action={{action "trash"}}
-        @icon="far-trash-alt"
+        @icon="trash-can"
         class="btn-danger pad-left no-text"
       />
       <DButton
diff --git a/app/assets/javascripts/discourse/app/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
index 56eb64e2438..14f11e7ffa1 100644
--- a/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-card-contents.hbs
@@ -154,7 +154,7 @@
             <li>
               <DButton
                 @action={{action "cancelFilter"}}
-                @icon="times"
+                @icon="xmark"
                 @label="topic.filters.cancel"
               />
             </li>
@@ -163,7 +163,7 @@
             <li>
               <DButton
                 @action={{fn (action "deleteUser") this.user}}
-                @icon="exclamation-triangle"
+                @icon="triangle-exclamation"
                 @label="admin.user.delete"
                 class="btn-danger"
               />
@@ -272,7 +272,7 @@
             {{/if}}
             {{#if this.user.location}}
               <span class="location">
-                {{d-icon "map-marker-alt"}}
+                {{d-icon "location-dot"}}
                 <span>{{this.user.location}}</span>
               </span>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/user-flag-percentage.js b/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
index 1f71b3346d1..efe37f1c5fa 100644
--- a/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
+++ b/app/assets/javascripts/discourse/app/components/user-flag-percentage.js
@@ -32,7 +32,7 @@ export default class UserFlagPercentage extends Component {
       result.className = "disagreed";
       result.label = `${result.disagreed}%`;
     } else {
-      result.icon = "external-link-alt";
+      result.icon = "up-right-from-square";
       result.className = "ignored";
       result.label = `${result.ignored}%`;
     }
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
index ead9b49845e..6fe664252c0 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
@@ -14,7 +14,7 @@
             {{/if}}
           </span>
         {{else}}
-          {{d-icon "plus-circle"}}
+          {{d-icon "circle-plus"}}
           <span class="item-label">
             {{i18n "user_status.set_custom_status"}}
           </span>
@@ -34,7 +34,7 @@
 
   <li class="activity">
     <LinkTo @route="userActivity" @model={{this.currentUser}}>
-      {{d-icon "stream"}}
+      {{d-icon "bars-staggered"}}
       <span class="item-label">
         {{i18n "user.activity_stream"}}
       </span>
@@ -67,7 +67,7 @@
 
   <li class="preferences">
     <LinkTo @route="preferences" @model={{this.currentUser}}>
-      {{d-icon "cog"}}
+      {{d-icon "gear"}}
       <span class="item-label">
         {{i18n "user.preferences.title"}}
       </span>
@@ -135,7 +135,7 @@
 
   <li class="logout">
     <DButton @action={{route-action "logout"}} class="btn-flat profile-tab-btn">
-      {{d-icon "sign-out-alt"}}
+      {{d-icon "right-from-bracket"}}
       <span class="item-label">
         {{i18n "user.log_out"}}
       </span>
diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs
index d76a28b0dfe..35ad34f81a0 100644
--- a/app/assets/javascripts/discourse/app/components/user-nav.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs
@@ -15,7 +15,7 @@
           @ariaCurrentContext="parentNav"
           class="user-nav__activity"
         >
-          {{d-icon "stream"}}
+          {{d-icon "bars-staggered"}}
           <span>{{i18n "user.activity_stream"}}</span>
         </DNavigationItem>
       {{/if}}
@@ -73,7 +73,7 @@
         @ariaCurrentContext="parentNav"
         class="user-nav__preferences"
       >
-        {{d-icon "cog"}}
+        {{d-icon "gear"}}
         <span>{{i18n "user.preferences.title"}}</span>
       </DNavigationItem>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/user-preferences/passkey-options-dropdown.js b/app/assets/javascripts/discourse/app/components/user-preferences/passkey-options-dropdown.js
index b3f7cb7bf16..784063bd419 100644
--- a/app/assets/javascripts/discourse/app/components/user-preferences/passkey-options-dropdown.js
+++ b/app/assets/javascripts/discourse/app/components/user-preferences/passkey-options-dropdown.js
@@ -15,12 +15,12 @@ export default class PasskeyOptionsDropdown extends DropdownSelectBoxComponent {
     return [
       {
         id: "edit",
-        icon: "pencil-alt",
+        icon: "pencil",
         name: I18n.t("user.second_factor.edit"),
       },
       {
         id: "delete",
-        icon: "trash-alt",
+        icon: "trash-can",
         name: I18n.t("user.second_factor.delete"),
       },
     ];
diff --git a/app/assets/javascripts/discourse/app/components/user-stream-item.hbs b/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
index 85ec28a84e5..fb6e9d12d2a 100644
--- a/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-stream-item.hbs
@@ -36,7 +36,7 @@
 
     {{#if @item.deleted_by}}
       <span class="delete-info">
-        {{d-icon "far-trash-alt"}}
+        {{d-icon "trash-can"}}
         {{avatar
           @item.deleted_by
           imageSize="tiny"
@@ -105,13 +105,13 @@
   <div class="user-stream-item-draft-actions">
     <DButton
       @action={{fn @resumeDraft @item}}
-      @icon="pencil-alt"
+      @icon="pencil"
       @label="drafts.resume"
       class="btn-default resume-draft"
     />
     <DButton
       @action={{fn @removeDraft @item}}
-      @icon="far-trash-alt"
+      @icon="trash-can"
       @title="drafts.remove"
       class="btn-danger remove-draft"
     />
diff --git a/app/assets/javascripts/discourse/app/components/username-preference.gjs b/app/assets/javascripts/discourse/app/components/username-preference.gjs
index e465d3ae9a8..8a5a00e8dec 100644
--- a/app/assets/javascripts/discourse/app/components/username-preference.gjs
+++ b/app/assets/javascripts/discourse/app/components/username-preference.gjs
@@ -148,7 +148,7 @@ export default class UsernamePreference extends Component {
         {{#if @user.can_edit_username}}
           <DButton
             @action={{this.toggleEditing}}
-            @icon="pencil-alt"
+            @icon="pencil"
             @title="user.username.edit"
             class="btn-small username-preference__edit-username"
           />
diff --git a/app/assets/javascripts/discourse/app/controllers/exception.js b/app/assets/javascripts/discourse/app/controllers/exception.js
index 0b9d9d5906f..1f361e15ca4 100644
--- a/app/assets/javascripts/discourse/app/controllers/exception.js
+++ b/app/assets/javascripts/discourse/app/controllers/exception.js
@@ -127,7 +127,7 @@ export default class ExceptionController extends Controller {
         classes: "btn-primary",
         action: this.tryLoading,
         key: "errors.buttons.again",
-        icon: "sync",
+        icon: "arrows-rotate",
       },
       ButtonLoadPage: {
         classes: "btn-primary",
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
index e8ed426fb1c..e0ca2c3f321 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js
@@ -209,7 +209,7 @@ export default class AccountController extends Controller.extend(
       message: I18n.t("user.delete_account_confirm"),
       buttons: [
         {
-          icon: "exclamation-triangle",
+          icon: "triangle-exclamation",
           label: I18n.t("user.delete_account"),
           class: "btn-danger",
           action: () => {
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index 91ad694895a..457dae2be50 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -79,7 +79,7 @@ export default class UserController extends Controller.extend(CanCheckEmails) {
   get collapsedInfoState() {
     return {
       isExpanded: !this.collapsedInfo,
-      icon: this.collapsedInfo ? "angle-double-down" : "angle-double-up",
+      icon: this.collapsedInfo ? "angles-down" : "angles-up",
       label: this.collapsedInfo ? "expand_profile" : "collapse_profile",
       ariaLabel: this.collapsedInfo
         ? "user.sr_expand_profile"
@@ -257,7 +257,7 @@ export default class UserController extends Controller.extend(CanCheckEmails) {
           },
         },
         {
-          icon: "exclamation-triangle",
+          icon: "triangle-exclamation",
           label: I18n.t("admin.user.delete_and_block"),
           class: "btn-danger",
           action: () => {
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs
index 1d43f4cf63a..4df9fb8a546 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs
@@ -20,7 +20,7 @@ export default class FKErrorsSummary extends Component {
     {{#if this.hasErrors}}
       <div class="form-kit__errors-summary" aria-live="assertive" ...attributes>
         <h2 class="form-kit__errors-summary-title">
-          {{icon "exclamation-triangle"}}
+          {{icon "triangle-exclamation"}}
           {{i18n "form_kit.errors_summary_title"}}
         </h2>
 
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs
index b6e8ed5ccb9..25899088679 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs
@@ -9,7 +9,7 @@ export default class FKErrors extends Component {
   <template>
     <p class="form-kit__errors" id={{@id}} aria-live="assertive" ...attributes>
       <span>
-        {{icon "exclamation-triangle"}}
+        {{icon "triangle-exclamation"}}
         {{this.concatErrors @error.messages}}
       </span>
     </p>
diff --git a/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
index 2284dfb2a0d..133d0b3a6a3 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-history-description.js
@@ -8,7 +8,7 @@ export default function reviewableHistoryDescription(rh) {
   switch (rh.reviewable_history_type) {
     case EDITED:
       return htmlSafe(
-        iconHTML("pencil-alt") + " " + I18n.t("review.history.edited")
+        iconHTML("pencil") + " " + I18n.t("review.history.edited")
       );
     default:
       return htmlSafe(htmlStatus(rh.status));
diff --git a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
index a649a0f2952..ddd9ac29296 100644
--- a/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/reviewable-status.js
@@ -38,30 +38,30 @@ function dataFor(status, type) {
       switch (type) {
         case "ReviewableQueuedPost":
           return {
-            icon: "times",
+            icon: "xmark",
             name: "rejected_post",
             cssClass: "rejected",
           };
         case "ReviewableUser":
           return {
-            icon: "times",
+            icon: "xmark",
             name: "rejected_user",
             cssClass: "rejected",
           };
         default:
           return {
-            icon: "times",
+            icon: "xmark",
             name: "rejected_flag",
             cssClass: "rejected",
           };
       }
     case IGNORED:
       return {
-        icon: "external-link-alt",
+        icon: "up-right-from-square",
         name: "ignored",
       };
     case DELETED:
-      return { icon: "trash-alt", name: "deleted" };
+      return { icon: "trash-can", name: "deleted" };
   }
 }
 
diff --git a/app/assets/javascripts/discourse/app/helpers/user-status.js b/app/assets/javascripts/discourse/app/helpers/user-status.js
index 9e4afefbe82..31b2ec1f1a1 100644
--- a/app/assets/javascripts/discourse/app/helpers/user-status.js
+++ b/app/assets/javascripts/discourse/app/helpers/user-status.js
@@ -12,7 +12,7 @@ export default function userStatus(user, { currentUser } = {}) {
 
   if (user.admin && currentUser?.staff) {
     return htmlSafe(
-      iconHTML("shield-alt", {
+      iconHTML("shield-halved", {
         label: I18n.t("user.admin", { user: name }),
       })
     );
@@ -20,7 +20,7 @@ export default function userStatus(user, { currentUser } = {}) {
 
   if (user.moderator) {
     return htmlSafe(
-      iconHTML("shield-alt", {
+      iconHTML("shield-halved", {
         label: I18n.t("user.moderator", { user: name }),
       })
     );
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js b/app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js
index 2ad79909a60..5d400109e3e 100644
--- a/app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/enable-emoji.js
@@ -14,7 +14,7 @@ export default {
         toolbar.addButton({
           id: "emoji",
           group: "extras",
-          icon: "far-smile",
+          icon: "far-face-smile",
           action: () => toolbar.context.send("emoji"),
           title: "composer.emoji",
           className: "emoji insert-emoji",
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/logout.js b/app/assets/javascripts/discourse/app/instance-initializers/logout.js
index 6a00e33d69c..f482181dcd1 100644
--- a/app/assets/javascripts/discourse/app/instance-initializers/logout.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/logout.js
@@ -42,7 +42,7 @@ class LogoutInit {
 
     this.dialog.alert({
       message: I18n.t("logout"),
-      confirmButtonLabel: "home",
+      confirmButtonLabel: "house",
       didConfirm: logout,
       didCancel: logout,
       shouldDisplayCancel: false,
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/post-decorations.js b/app/assets/javascripts/discourse/app/instance-initializers/post-decorations.js
index 322ac160d48..ac254d84084 100644
--- a/app/assets/javascripts/discourse/app/instance-initializers/post-decorations.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/post-decorations.js
@@ -199,7 +199,7 @@ export default {
             title: "table_builder.edit.btn_edit",
             label: "table_builder.edit.btn_edit",
             icon: {
-              name: "pencil-alt",
+              name: "pencil",
               class: "edit-table-icon",
             },
           });
diff --git a/app/assets/javascripts/discourse/app/instance-initializers/video-placeholder.js b/app/assets/javascripts/discourse/app/instance-initializers/video-placeholder.js
index 9deb040a700..dd9e4db8633 100644
--- a/app/assets/javascripts/discourse/app/instance-initializers/video-placeholder.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/video-placeholder.js
@@ -44,7 +44,7 @@ export default {
               const notice = document.createElement("div");
               notice.className = "notice";
               notice.innerHTML =
-                iconHTML("exclamation-triangle") +
+                iconHTML("triangle-exclamation") +
                 " " +
                 I18n.t("cannot_render_video");
 
diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index 46e441e9418..0e263ea8d6a 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -176,7 +176,7 @@ export default function (options) {
     const divs = transformed.map((itm) => {
       let d = $(
         `<div class='item'><span>${itm}<a class='remove' href>${iconHTML(
-          "times"
+          "xmark"
         )}</a></span></div>`
       );
       const $parent = me.parent();
diff --git a/app/assets/javascripts/discourse/app/lib/notification-types/admin-problems.js b/app/assets/javascripts/discourse/app/lib/notification-types/admin-problems.js
index 4009929092d..f1b798beb96 100644
--- a/app/assets/javascripts/discourse/app/lib/notification-types/admin-problems.js
+++ b/app/assets/javascripts/discourse/app/lib/notification-types/admin-problems.js
@@ -16,6 +16,6 @@ export default class extends NotificationTypeBase {
   }
 
   get icon() {
-    return "exclamation-triangle";
+    return "triangle-exclamation";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.gjs b/app/assets/javascripts/discourse/app/lib/plugin-api.gjs
index a923fa31214..1cc160fd546 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.gjs
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.gjs
@@ -504,17 +504,17 @@ class PluginApi {
    *
    *   // for the place in code that render a string
    *   string() {
-   *     return "<svg class=\"fa d-icon d-icon-far-smile svg-icon\" aria-hidden=\"true\"><use href=\"#far-smile\"></use></svg>";
+   *     return "<svg class=\"fa d-icon d-icon-far-face-smile svg-icon\" aria-hidden=\"true\"><use href=\"#far-face-smile\"></use></svg>";
    *   },
    *
    *   // for the places in code that render virtual dom elements
    *   node() {
    *     return h("svg", {
-   *          attributes: { class: "fa d-icon d-icon-far-smile", "aria-hidden": true },
+   *          attributes: { class: "fa d-icon d-icon-far-face-smile", "aria-hidden": true },
    *          namespace: "http://www.w3.org/2000/svg"
    *        },[
    *          h("use", {
-   *          "href": attributeHook("http://www.w3.org/1999/xlink", `#far-smile`),
+   *          "href": attributeHook("http://www.w3.org/1999/xlink", `#far-face-smile`),
    *          namespace: "http://www.w3.org/2000/svg"
    *        })]
    *     );
@@ -779,7 +779,7 @@ class PluginApi {
    * api.addPostMenuButton('coffee', () => {
    *   return {
    *     action: 'drinkCoffee',
-   *     icon: 'coffee',
+   *     icon: 'mug-saucer',
    *     className: 'hot-coffee',
    *     title: 'coffee.title',
    *     position: 'first'  // can be `first`, `last` or `second-last-hidden`
@@ -808,7 +808,7 @@ class PluginApi {
    *        drinkCoffee(post);
    *        showFeedback('discourse_plugin.coffee.drink');
    *      },
-   *      icon: 'coffee',
+   *      icon: 'mug-saucer',
    *      className: 'hot-coffee',
    *    }
    *  }
@@ -829,7 +829,7 @@ class PluginApi {
    *     action: () => {
    *       alert('You clicked on the coffee button!');
    *     },
-   *     icon: 'coffee',
+   *     icon: 'mug-saucer',
    *     className: 'hot-coffee',
    *     label: 'coffee.title',
    *   };
@@ -853,7 +853,7 @@ class PluginApi {
    *     action: () => {
    *       alert('You clicked on the coffee button!');
    *     },
-   *     icon: 'coffee',
+   *     icon: 'mug-saucer',
    *     className: 'hot-coffee',
    *     label: 'coffee.title',
    *   };
@@ -2181,7 +2181,7 @@ class PluginApi {
    *
    * ```
    * api.addQuickAccessProfileItem({
-   *   icon: "pencil-alt",
+   *   icon: "pencil",
    *   href: "/somewhere",
    *   content: I18n.t("user.somewhere")
    * })
@@ -2864,7 +2864,7 @@ class PluginApi {
    *     }
    *
    *     get actionsIcon() {
-   *       return "cog";
+   *       return "gear";
    *     }
    *
    *     get actions() {
@@ -2943,7 +2943,7 @@ class PluginApi {
    *             return "icon";
    *           }
    *           get hoverValue() {
-   *             return "times";
+   *             return "xmark";
    *           }
    *           get hoverAction() {
    *             return () => {};
@@ -3106,7 +3106,7 @@ class PluginApi {
    * ```
    * api.addBulkActionButton({
    *   label: "super_plugin.bulk.enhance",
-   *   icon: "magic",
+   *   icon: wand-magic,
    *   class: "btn-default",
    *   visible: ({ currentUser, siteSettings }) => siteSettings.super_plugin_enabled && currentUser.staff,
    *   async action({ setComponent }) {
diff --git a/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
index 43381915709..1906148aad3 100644
--- a/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
+++ b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
@@ -47,7 +47,7 @@ export default function renderTopicFeaturedLink(topic) {
   if (meta) {
     return `<a class="topic-featured-link" rel="${meta.rel}" target="${
       meta.target
-    }" href="${meta.href}">${renderIcon("string", "external-link-alt")} ${
+    }" href="${meta.href}">${renderIcon("string", "up-right-from-square")} ${
       meta.domain
     }</a>`;
   } else {
@@ -63,7 +63,7 @@ export function topicFeaturedLinkNode(topic) {
       {
         attributes: { href: meta.href, rel: meta.rel, target: meta.target },
       },
-      [renderIcon("node", "external-link-alt"), meta.domain]
+      [renderIcon("node", "up-right-from-square"), meta.domain]
     );
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/admin-nav-map.js b/app/assets/javascripts/discourse/app/lib/sidebar/admin-nav-map.js
index 6a830a6d3aa..79ff51cbaae 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/admin-nav-map.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/admin-nav-map.js
@@ -9,7 +9,7 @@ export const ADMIN_NAV_MAP = [
         name: "admin_backups",
         route: "admin.backups",
         label: "admin.account.sidebar_link.backups",
-        icon: "archive",
+        icon: "box-archive",
       },
       {
         name: "admin_whats_new",
@@ -44,7 +44,7 @@ export const ADMIN_NAV_MAP = [
         routeModels: ["required"],
         query: { filter: "" },
         label: "admin.community.sidebar_link.about_your_site",
-        icon: "cog",
+        icon: "gear",
       },
       {
         name: "admin_badges",
@@ -86,7 +86,7 @@ export const ADMIN_NAV_MAP = [
         name: "admin_user_fields",
         route: "adminUserFields",
         label: "admin.community.sidebar_link.user_fields",
-        icon: "user-edit",
+        icon: "user-pen",
       },
       {
         name: "admin_watched_words",
@@ -149,7 +149,7 @@ export const ADMIN_NAV_MAP = [
         routeModels: ["all_results"],
         query: { filter: "navigation" },
         label: "admin.appearance.sidebar_link.navigation",
-        icon: "project-diagram",
+        icon: "diagram-project",
       },
       {
         name: "admin_themes",
@@ -157,7 +157,7 @@ export const ADMIN_NAV_MAP = [
         routeModels: ["themes"],
         model: "themes",
         label: "admin.appearance.sidebar_link.themes",
-        icon: "paint-brush",
+        icon: "paintbrush",
       },
       {
         name: "admin_components",
@@ -195,7 +195,7 @@ export const ADMIN_NAV_MAP = [
         name: "admin_server_setup",
         route: "adminEmail.index",
         label: "admin.email_settings.sidebar_link.server_setup",
-        icon: "cog",
+        icon: "gear",
       },
     ],
   },
@@ -213,13 +213,13 @@ export const ADMIN_NAV_MAP = [
         name: "admin_email_skipped",
         route: "adminEmail.skipped",
         label: "admin.email_logs.sidebar_link.skipped",
-        icon: "angle-double-right",
+        icon: "angles-right",
       },
       {
         name: "admin_email_bounced",
         route: "adminEmail.bounced",
         label: "admin.email_logs.sidebar_link.bounced",
-        icon: "times",
+        icon: "xmark",
       },
       {
         name: "admin_email_received",
@@ -243,7 +243,7 @@ export const ADMIN_NAV_MAP = [
         name: "admin_logs_error_logs",
         href: getURL("/logs"),
         label: "admin.security.sidebar_link.error_logs",
-        icon: "external-link-alt",
+        icon: "up-right-from-square",
       },
       {
         name: "admin_logs_screened_emails",
@@ -270,7 +270,7 @@ export const ADMIN_NAV_MAP = [
         name: "admin_logs_search_logs",
         route: "adminSearchLogs",
         label: "admin.security.sidebar_link.search_logs",
-        icon: "search",
+        icon: "magnifying-glass",
         moderator: true,
       },
       {
@@ -348,7 +348,7 @@ export const ADMIN_NAV_MAP = [
         routeModels: ["user_api"],
         query: { filter: "" },
         label: "admin.advanced.sidebar_link.user_api",
-        icon: "random",
+        icon: "shuffle",
       },
       {
         name: "admin_api_web_hooks",
@@ -386,7 +386,7 @@ export const ADMIN_NAV_MAP = [
         routeModels: ["search"],
         query: { filter: "" },
         label: "admin.advanced.sidebar_link.search",
-        icon: "search",
+        icon: "magnifying-glass",
       },
       {
         name: "admin_experimental",
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js b/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js
index ae6a95e424f..895a301f2d6 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js
@@ -190,7 +190,7 @@ export function useAdminNavConfig(navMap) {
           name: "admin_home",
           route: "admin.dashboard.general",
           label: "admin.dashboard.title",
-          icon: "home",
+          icon: "house",
           moderator: true,
         },
         {
@@ -204,7 +204,7 @@ export function useAdminNavConfig(navMap) {
           name: "admin_all_site_settings",
           route: "adminSiteSettings",
           label: "admin.advanced.sidebar_link.all_site_settings",
-          icon: "cog",
+          icon: "gear",
         },
       ],
     },
@@ -282,7 +282,7 @@ function pluginAdminRouteLinks() {
           ? [plugin.admin_route.location]
           : [],
         label: plugin.admin_route.label,
-        icon: "cog",
+        icon: "gear",
       };
     });
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js
index 5974670bcb8..bae4df2ebc1 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/about-section-link.js
@@ -22,6 +22,6 @@ export default class AboutSectionLink extends BaseSectionLink {
   }
 
   get defaultPrefixValue() {
-    return "info-circle";
+    return "circle-info";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js
index 1f9bb6d3cd2..dcb1643dac8 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/faq-section-link.js
@@ -38,6 +38,6 @@ export default class FAQSectionLink extends BaseSectionLink {
   }
 
   get defaultPrefixValue() {
-    return "question-circle";
+    return "circle-question";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js
index b8db34fbd03..57218009aff 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/groups-section-link.js
@@ -26,6 +26,6 @@ export default class GroupsSectionLink extends BaseSectionLink {
   }
 
   get defaultPrefixValue() {
-    return "user-friends";
+    return "user-group";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js b/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
index ede0078e9ee..2a7f5c1bf9b 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
@@ -17,7 +17,7 @@ class MainSidebarPanel {
   }
 
   get switchButtonIcon() {
-    return "random";
+    return "shuffle";
   }
 
   get switchButtonDefaultUrl() {
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/section.js b/app/assets/javascripts/discourse/app/lib/sidebar/section.js
index 4c076ae676f..c3a3c010ec1 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/section.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/section.js
@@ -54,7 +54,7 @@ export default class Section {
   }
 
   get headerActionIcon() {
-    return "pencil-alt";
+    return "pencil";
   }
 
   @bind
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section.js
index 49dbaa757e3..756bd31ceb6 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section.js
@@ -24,6 +24,6 @@ export default class extends CommonCommunitySection {
   }
 
   get moreSectionButtonIcon() {
-    return "pencil-alt";
+    return "pencil";
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js
index ef1493cdce2..4e93ba5512b 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js
@@ -100,7 +100,7 @@ export default class MyPostsSectionLink extends BaseSectionLink {
 
   get defaultPrefixValue() {
     if (this._hasDraft && this.currentUser?.new_new_view_enabled) {
-      return "pencil-alt";
+      return "pencil";
     }
     return "user";
   }
diff --git a/app/assets/javascripts/discourse/app/lib/time-shortcut.js b/app/assets/javascripts/discourse/app/lib/time-shortcut.js
index 6922e47a5dd..e9830f709fb 100644
--- a/app/assets/javascripts/discourse/app/lib/time-shortcut.js
+++ b/app/assets/javascripts/discourse/app/lib/time-shortcut.js
@@ -139,7 +139,7 @@ export function timeShortcuts(timezone) {
     laterThisWeek() {
       return {
         id: TIME_SHORTCUT_TYPES.LATER_THIS_WEEK,
-        icon: "angle-double-right",
+        icon: "angles-right",
         label: "time_shortcut.later_this_week",
         time: laterThisWeek(timezone),
         timeFormatKey: "dates.time_short_day",
@@ -241,7 +241,7 @@ export function timeShortcuts(timezone) {
     },
     custom() {
       return {
-        icon: "calendar-alt",
+        icon: "calendar-days",
         id: TIME_SHORTCUT_TYPES.CUSTOM,
         label: "time_shortcut.custom",
         time: null,
@@ -250,7 +250,7 @@ export function timeShortcuts(timezone) {
     },
     lastCustom() {
       return {
-        icon: "undo",
+        icon: "arrow-rotate-left",
         id: TIME_SHORTCUT_TYPES.LAST_CUSTOM,
         label: "time_shortcut.last_custom",
         time: null,
@@ -268,7 +268,7 @@ export function timeShortcuts(timezone) {
     now() {
       return {
         id: TIME_SHORTCUT_TYPES.NOW,
-        icon: "magic",
+        icon: "wand-magic",
         label: "time_shortcut.now",
         time: now(timezone),
       };
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 5af6748b4b6..9dbc5dfd803 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -108,7 +108,7 @@ export const SAVE_LABELS = {
 };
 
 export const SAVE_ICONS = {
-  [EDIT]: "pencil-alt",
+  [EDIT]: "pencil",
   [EDIT_SHARED_DRAFT]: "far-clipboard",
   [REPLY]: "reply",
   [CREATE_TOPIC]: "plus",
diff --git a/app/assets/javascripts/discourse/app/models/user-action.js b/app/assets/javascripts/discourse/app/models/user-action.js
index 4c1eacef541..ed269a72fd5 100644
--- a/app/assets/javascripts/discourse/app/models/user-action.js
+++ b/app/assets/javascripts/discourse/app/models/user-action.js
@@ -174,7 +174,7 @@ export default class UserAction extends RestModel {
       groups = {
         likes: UserActionGroup.create({ icon: "heart" }),
         stars: UserActionGroup.create({ icon: "star" }),
-        edits: UserActionGroup.create({ icon: "pencil-alt" }),
+        edits: UserActionGroup.create({ icon: "pencil" }),
         bookmarks: UserActionGroup.create({ icon: "bookmark" }),
       };
     }
diff --git a/app/assets/javascripts/discourse/app/raw-templates/topic-list-header-column.hbr b/app/assets/javascripts/discourse/app/raw-templates/topic-list-header-column.hbr
index 9f6383cf399..5bf4235e64e 100644
--- a/app/assets/javascripts/discourse/app/raw-templates/topic-list-header-column.hbr
+++ b/app/assets/javascripts/discourse/app/raw-templates/topic-list-header-column.hbr
@@ -1,7 +1,7 @@
 <th data-sort-order='{{order}}' class='{{view.className}} topic-list-data' scope="col" {{#if view.ariaSort}}aria-sort='{{view.ariaSort}}'{{/if}}>
   {{~#if canBulkSelect}}
     {{~#if showBulkToggle}}
-      {{raw "flat-button" class="bulk-select" icon="tasks" title="topics.bulk.toggle"}}
+      {{raw "flat-button" class="bulk-select" icon="list-check" title="topics.bulk.toggle"}}
     {{/if ~}}
     {{~#if bulkSelectEnabled}}
       <span class='bulk-select-topics'>
diff --git a/app/assets/javascripts/discourse/app/raw-templates/topic-list-header.hbr b/app/assets/javascripts/discourse/app/raw-templates/topic-list-header.hbr
index fbd04182db8..75abc52db93 100644
--- a/app/assets/javascripts/discourse/app/raw-templates/topic-list-header.hbr
+++ b/app/assets/javascripts/discourse/app/raw-templates/topic-list-header.hbr
@@ -3,7 +3,7 @@
 {{#if bulkSelectEnabled}}
   <th class="bulk-select topic-list-data">
     {{#if canBulkSelect}}
-      {{raw "flat-button" class="bulk-select" icon="tasks" title="topics.bulk.toggle"}}
+      {{raw "flat-button" class="bulk-select" icon="list-check" title="topics.bulk.toggle"}}
     {{/if}}
   </th>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-read.js b/app/assets/javascripts/discourse/app/routes/user-activity-read.js
index 03889b9fa27..cb10e258a7a 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-read.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-read.js
@@ -31,7 +31,7 @@ export default class UserActivityRead extends UserTopicListRoute {
       I18n.t("user_activity.no_read_topics_body", {
         topUrl: getURL("/top"),
         categoriesUrl: getURL("/categories"),
-        searchIcon: iconHTML("search"),
+        searchIcon: iconHTML("magnifying-glass"),
       })
     );
     return { title, body };
diff --git a/app/assets/javascripts/discourse/app/services/composer.js b/app/assets/javascripts/discourse/app/services/composer.js
index e1164d68aa2..14b4ef517fe 100644
--- a/app/assets/javascripts/discourse/app/services/composer.js
+++ b/app/assets/javascripts/discourse/app/services/composer.js
@@ -1641,7 +1641,7 @@ export default class ComposerService extends Service {
           {
             label: I18n.t("drafts.abandon.yes_value"),
             class: "btn-danger",
-            icon: "far-trash-alt",
+            icon: "trash-can",
             action: () => {
               this.destroyDraft(data.draft_sequence).finally(() => {
                 data.draft = null;
diff --git a/app/assets/javascripts/discourse/app/templates/badges/show.hbs b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
index ff782afe480..b8f481e212d 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
@@ -22,7 +22,7 @@
             {{i18n "badges.allow_title"}}
             <DButton
               @action={{this.toggleSetUserTitle}}
-              @icon="pencil-alt"
+              @icon="pencil"
               class="btn-default pad-left"
             />
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
index 9b3eaac6077..71cdaffde0e 100644
--- a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
@@ -97,7 +97,7 @@
       <DButton
         @disabled={{this.deleteDisabled}}
         @action={{action "deleteCategory"}}
-        @icon="far-trash-alt"
+        @icon="trash-can"
         @label="category.delete"
         class="btn-danger"
       />
@@ -106,7 +106,7 @@
         <DButton
           @disabled={{this.deleteDisabled}}
           @action={{action "toggleDeleteTooltip"}}
-          @icon="question-circle"
+          @icon="circle-question"
           @label="category.delete"
           class="btn-default"
         />
diff --git a/app/assets/javascripts/discourse/app/templates/exception.hbs b/app/assets/javascripts/discourse/app/templates/exception.hbs
index 45f281bfcbc..2ee60e9824c 100644
--- a/app/assets/javascripts/discourse/app/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/app/templates/exception.hbs
@@ -16,7 +16,7 @@
       {{/if}}
       <div class="desc">
         {{#if this.networkFixed}}
-          {{d-icon "check-circle"}}
+          {{d-icon "circle-check"}}
         {{/if}}
 
         {{this.desc}}
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index 6fd74097fe1..23df58a75f3 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -39,7 +39,7 @@
       />
       <DButton
         @action={{fn (action "search") (hash collapseFilters=true)}}
-        @icon="search"
+        @icon="magnifying-glass"
         @label="search.search_button"
         @ariaLabel="search.search_button"
         @disabled={{this.searchButtonDisabled}}
@@ -120,7 +120,7 @@
           {{#if this.bulkSelectEnabled}}
             {{#if this.hasUnselectedResults}}
               <DButton
-                @icon="check-square"
+                @icon="square-check"
                 @action={{action "selectAll"}}
                 @label="search.select_all"
                 class="btn-default bulk-select-all"
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index c6313837733..aad278560b1 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -44,7 +44,7 @@
           <DButton
             @action={{this.bulkSelectAll}}
             @label="topics.bulk.select_all"
-            @icon="check-square"
+            @icon="square-check"
             class="bulk-select-all"
           />
         </span>
@@ -169,7 +169,7 @@
                   {{/if}}
                   <span class="directory-table__value">
                     {{#if m.owner}}
-                      {{d-icon "shield-alt"}}
+                      {{d-icon "shield-halved"}}
                       {{i18n "groups.members.owner"}}<br />
                     {{/if}}
                     {{#if m.primary}}
diff --git a/app/assets/javascripts/discourse/app/templates/group.hbs b/app/assets/javascripts/discourse/app/templates/group.hbs
index 400df39660b..da39f6abb57 100644
--- a/app/assets/javascripts/discourse/app/templates/group.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group.hbs
@@ -44,7 +44,7 @@
         {{#if this.model.automatic}}
           <DTooltip class="admin-group-automatic-tooltip">
             <:trigger>
-              {{d-icon "cog"}}
+              {{d-icon "gear"}}
               {{i18n "admin.groups.manage.membership.automatic"}}
             </:trigger>
             <:content>
@@ -65,7 +65,7 @@
           {{#if this.model.automatic}}
             <DButton
               @action={{this.toggleDeleteTooltip}}
-              @icon="question-circle"
+              @icon="circle-question"
               @label="admin.groups.delete"
               class="btn-default"
             />
@@ -73,7 +73,7 @@
             <DButton
               @action={{this.destroyGroup}}
               @disabled={{this.destroying}}
-              @icon="trash-alt"
+              @icon="trash-can"
               @label="admin.groups.delete"
               class="btn-danger"
               data-test-selector="delete-group-button"
diff --git a/app/assets/javascripts/discourse/app/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
index c09bd5a84fb..01d71d1b025 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
@@ -85,7 +85,7 @@
                     >
                       {{#if group.is_group_owner}}
                         <span class="is-group-owner">
-                          {{d-icon "shield-alt"}}
+                          {{d-icon "shield-halved"}}
                           {{i18n "groups.index.is_group_owner"}}
                         </span>
                       {{else if group.is_group_user}}
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index a5075f5778b..f11a25ac7a2 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -143,7 +143,7 @@
                         class="caps-lock-warning
                           {{unless this.capsLockOn 'hidden'}}"
                       >
-                        {{d-icon "exclamation-triangle"}}
+                        {{d-icon "triangle-exclamation"}}
                         {{i18n "login.caps_lock_warning"}}
                       </div>
                     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
index 7b7ee52c759..ad660ba6e90 100644
--- a/app/assets/javascripts/discourse/app/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
@@ -93,7 +93,7 @@
             />
 
             <div class="caps-lock-warning {{unless this.capsLockOn 'hidden'}}">
-              {{d-icon "exclamation-triangle"}}
+              {{d-icon "triangle-exclamation"}}
               {{i18n "login.caps_lock_warning"}}
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 910320cc3b3..8a8bf62a218 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -19,7 +19,7 @@
       {{bound-avatar this.model "huge"}}
       <DButton
         @action={{fn (route-action "showAvatarSelector") this.model}}
-        @icon="pencil-alt"
+        @icon="pencil"
         id="edit-avatar"
         class="btn-default pad-left"
       />
@@ -89,7 +89,7 @@
               @route="preferences.email"
               class="btn btn-default btn-small btn-icon pad-left no-text"
             >
-              {{d-icon "pencil-alt"}}
+              {{d-icon "pencil"}}
             </LinkTo>
           {{/if}}
         </div>
@@ -141,7 +141,7 @@
                         authProvider.account
                       }}
                       @title="user.associated_accounts.revoke"
-                      @icon="trash-alt"
+                      @icon="trash-can"
                       @disabled={{get this.revoking authProvider.method.name}}
                       class="btn-danger no-text"
                     />
@@ -253,7 +253,7 @@
       {{/if}}
       <DButton
         @action={{fn (action "showUserStatusModal") this.newStatus}}
-        @icon="pencil-alt"
+        @icon="pencil"
         class="btn-default btn-small pad-left"
       />
     </div>
@@ -329,7 +329,7 @@
       <DButton
         @action={{action "delete"}}
         @disabled={{this.deleteDisabled}}
-        @icon="far-trash-alt"
+        @icon="trash-can"
         @label="user.delete_account"
         class="btn-danger"
       />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index b237b879190..fcc86a0a8e8 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -73,7 +73,7 @@
         <DButton
           @action={{action "undoColorSchemePreview"}}
           @label="user.color_schemes.undo"
-          @icon="undo"
+          @icon="arrow-rotate-left"
           class="btn-default btn-small undo-preview"
         />
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
index d53c01fefab..c2fcfbe6c6e 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
@@ -112,7 +112,7 @@
       {{on "click" (fn this.revokeAuthToken null)}}
       class="pull-right text-danger"
     >
-      {{d-icon "sign-out-alt"}}
+      {{d-icon "right-from-bracket"}}
       <span>
         {{i18n "user.auth_tokens.log_out_all"}}
       </span>
diff --git a/app/assets/javascripts/discourse/app/templates/review-index.hbs b/app/assets/javascripts/discourse/app/templates/review-index.hbs
index b0538d1ee98..d74e4babcba 100644
--- a/app/assets/javascripts/discourse/app/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-index.hbs
@@ -113,7 +113,7 @@
           </label>
           <DButton
             @label="review.show_all_topics"
-            @icon="times"
+            @icon="xmark"
             @action={{action "resetTopic"}}
             class="btn-default"
           />
@@ -147,7 +147,7 @@
 
     <div class="reviewable-filters-actions">
       <DButton
-        @icon="sync"
+        @icon="arrows-rotate"
         @label="review.filters.refresh"
         @action={{action "refresh"}}
         class="btn-primary refresh"
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 3d183c6722c..70b28f7ee75 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -98,7 +98,7 @@
               />
               <DButton
                 @action={{action "cancelEditingTopic"}}
-                @icon="times"
+                @icon="xmark"
                 @ariaLabel="composer.cancel"
                 class="btn-default cancel-edit"
               />
@@ -110,7 +110,7 @@
                   class="remove-featured-link"
                   title={{i18n "composer.remove_featured_link"}}
                 >
-                  {{d-icon "times-circle"}}
+                  {{d-icon "circle-xmark"}}
                   {{this.featuredLinkDomain}}
                 </a>
               {{/if}}
@@ -151,7 +151,7 @@
                 {{on "click" this.editTopic}}
                 class="edit-topic"
                 title={{i18n "edit_topic"}}
-              >{{d-icon "pencil-alt"}}</a>
+              >{{d-icon "pencil"}}</a>
             {{/if}}
 
             <PluginOutlet
@@ -434,7 +434,7 @@
                         />
                         <DButton
                           @label="review.delete"
-                          @icon="trash-alt"
+                          @icon="trash-can"
                           @action={{fn (action "deletePending") pending}}
                           class="btn-danger"
                         />
@@ -604,7 +604,7 @@
             {{else}}
               <DButton
                 @action={{action "retryLoading"}}
-                @icon="sync"
+                @icon="arrows-rotate"
                 @label="errors.buttons.again"
                 class="btn-primary topic-retry"
               />
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
index 9e3c396b63f..1c0413f61d4 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
@@ -43,7 +43,7 @@
               </span>
             {{else}}
               <DButton
-                @icon="times"
+                @icon="xmark"
                 @action={{this.destroyAllExpired}}
                 @label="user.invited.remove_all"
               />
@@ -61,7 +61,7 @@
               </span>
             {{else if this.hasEmailInvites}}
               <DButton
-                @icon="sync"
+                @icon="arrows-rotate"
                 @action={{this.reinviteAll}}
                 @label="user.invited.reinvite_all"
                 class="btn-default"
@@ -184,13 +184,13 @@
                   {{#if invite.can_delete_invite}}
                     <td class="invite-actions">
                       <DButton
-                        @icon="pencil-alt"
+                        @icon="pencil"
                         @action={{fn this.editInvite invite}}
                         @title="user.invited.edit"
                         class="btn-default"
                       />
                       <DButton
-                        @icon="trash-alt"
+                        @icon="trash-can"
                         @action={{fn this.destroyInvite invite}}
                         @title={{if
                           invite.destroyed
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs
index c4cb2e32b79..80be6217763 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-group.hbs
@@ -15,7 +15,7 @@
       @ariaCurrentContext="subNav"
       class="user-nav__messages-group-new"
     >
-      {{d-icon "exclamation-circle"}}
+      {{d-icon "circle-exclamation"}}
       <span>{{this.newLinkText}}</span>
     </DNavigationItem>
 
@@ -24,7 +24,7 @@
       @ariaCurrentContext="subNav"
       class="user-nav__messages-group-unread"
     >
-      {{d-icon "plus-circle"}}
+      {{d-icon "circle-plus"}}
       <span>{{this.unreadLinkText}}</span>
     </DNavigationItem>
 
@@ -33,7 +33,7 @@
       @ariaCurrentContext="subNav"
       class="user-nav__messages-group-archive"
     >
-      {{d-icon "archive"}}
+      {{d-icon "box-archive"}}
       <span>{{i18n "user.messages.archive"}}</span>
     </DNavigationItem>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs
index 869e93780d4..1fefc8319dc 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-user.hbs
@@ -29,7 +29,7 @@
       @ariaCurrentContext="subNav"
       class="user-nav__messages-new"
     >
-      {{d-icon "exclamation-circle"}}
+      {{d-icon "circle-exclamation"}}
       <span>{{this.newLinkText}}</span>
     </DNavigationItem>
 
@@ -38,7 +38,7 @@
       @ariaCurrentContext="subNav"
       class="user-nav__messages-unread"
     >
-      {{d-icon "plus-circle"}}
+      {{d-icon "circle-plus"}}
       <span>{{this.unreadLinkText}}</span>
     </DNavigationItem>
 
@@ -49,7 +49,7 @@
     @ariaCurrentContext="subNav"
     class="user-nav__messages-archive"
   >
-    {{d-icon "archive"}}
+    {{d-icon "box-archive"}}
     <span>{{i18n "user.messages.archive"}}</span>
   </DNavigationItem>
 
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 622c3008755..927c44ae635 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -191,7 +191,7 @@
             >
               {{#if this.model.location}}<div
                   class="user-profile-location"
-                >{{d-icon "map-marker-alt"~}}
+                >{{d-icon "location-dot"~}}
                   {{this.model.location}}</div>{{/if}}
               {{#if this.model.website_name}}
                 <div class="user-profile-website">
@@ -439,7 +439,7 @@
               {{#if this.canDeleteUser}}
                 <div class="pull-right"><DButton
                     @action={{action "adminDelete"}}
-                    @icon="exclamation-triangle"
+                    @icon="triangle-exclamation"
                     @label="user.admin_delete"
                     class="btn-danger btn-delete-user"
                   /></div>
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index 6993f2361a0..dcb66a54e34 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -7,7 +7,7 @@
       @ariaCurrentContext="subNav"
       class="user-nav__activity-all"
     >
-      {{d-icon "stream"}}
+      {{d-icon "bars-staggered"}}
       <span>{{i18n "user.filters.all"}}</span>
     </DNavigationItem>
 
@@ -35,7 +35,7 @@
         class="user-nav__activity-read"
         title={{i18n "user.read_help"}}
       >
-        {{d-icon "history"}}
+        {{d-icon "clock-rotate-left"}}
         <span>{{i18n "user.read"}}</span>
       </DNavigationItem>
     {{/if}}
@@ -46,7 +46,7 @@
         @ariaCurrentContext="subNav"
         class="user-nav__activity-drafts"
       >
-        {{d-icon "pencil-alt"}}
+        {{d-icon "pencil"}}
         <span>{{this.draftLabel}}</span>
       </DNavigationItem>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
index b34c56a6f64..ad6fd9208fd 100644
--- a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
@@ -22,7 +22,11 @@
         id="bookmark-search"
         autocomplete="off"
       />
-      <DButton @action={{this.search}} @icon="search" class="btn-primary" />
+      <DButton
+        @action={{this.search}}
+        @icon="magnifying-glass"
+        class="btn-primary"
+      />
     </div>
     {{#if this.nothingFound}}
       <div class="alert alert-info">{{i18n "user.no_bookmarks_search"}}</div>
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index 95045501e2d..f46d401df98 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -49,7 +49,7 @@
       @ariaCurrentContext="subNav"
       class="user-nav__notifications-edits"
     >
-      {{d-icon "pencil-alt"}}
+      {{d-icon "pencil"}}
       <span>{{i18n "user_action_groups.11"}}</span>
     </DNavigationItem>
 
diff --git a/app/assets/javascripts/discourse/app/widgets/post-cooked.js b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
index 2eca9e4044b..d1e968d212d 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-cooked.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-cooked.js
@@ -236,7 +236,7 @@ export default class PostCooked {
         blockQuote.appendChild(div);
       } catch (e) {
         if ([403, 404].includes(e.jqXHR.status)) {
-          const icon = e.jqXHR.status === 403 ? "lock" : "far-trash-alt";
+          const icon = e.jqXHR.status === 403 ? "lock" : "trash-can";
           blockQuote.innerHTML = `<div class='expanded-quote icon-only'>${iconHTML(
             icon
           )}</div>`;
diff --git a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
index 0916f6580d0..30d221faa15 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
@@ -32,14 +32,14 @@ export default createWidget("post-edits-indicator", {
   tagName: "div.post-info.edits",
 
   html(attrs) {
-    let icon = "pencil-alt";
+    let icon = "pencil";
     const updatedAt = new Date(attrs.updated_at);
     let className = historyHeat(this.siteSettings, updatedAt);
     const date = longDate(updatedAt);
     let title;
 
     if (attrs.wiki) {
-      icon = "far-edit";
+      icon = "far-pen-to-square";
       className = `${className || ""} wiki`.trim();
 
       if (attrs.version > 1) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js
index 5d09ed13db5..36e9ea63f53 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js
@@ -126,7 +126,7 @@ registerButton("read", (attrs) => {
     return {
       action: "toggleWhoRead",
       title: "post.controls.read_indicator",
-      icon: "book-reader",
+      icon: "book-open-reader",
       before: "read-count",
       addContainer: false,
     };
@@ -245,7 +245,7 @@ registerButton("edit", (attrs) => {
       action: "editPost",
       className: "edit",
       title: "post.controls.edit",
-      icon: "pencil-alt",
+      icon: "pencil",
       alwaysShowYours: true,
     };
   }
@@ -276,7 +276,7 @@ registerButton("wiki-edit", (attrs) => {
       action: "editPost",
       className: "edit create",
       title: "post.controls.edit",
-      icon: "far-edit",
+      icon: "far-pen-to-square",
       alwaysShowYours: true,
     };
     if (!attrs.mobileView) {
@@ -443,7 +443,7 @@ registerButton("delete", (attrs) => {
       id: "recover_topic",
       action: "recoverPost",
       title: "topic.actions.recover",
-      icon: "undo",
+      icon: "arrow-rotate-left",
       className: "recover",
     };
   } else if (attrs.canDeleteTopic) {
@@ -451,7 +451,7 @@ registerButton("delete", (attrs) => {
       id: "delete_topic",
       action: "deletePost",
       title: "post.controls.delete_topic",
-      icon: "far-trash-alt",
+      icon: "trash-can",
       className: "delete",
     };
   } else if (attrs.canRecover) {
@@ -459,7 +459,7 @@ registerButton("delete", (attrs) => {
       id: "recover",
       action: "recoverPost",
       title: "post.controls.undelete",
-      icon: "undo",
+      icon: "arrow-rotate-left",
       className: "recover",
     };
   } else if (attrs.canDelete) {
@@ -467,7 +467,7 @@ registerButton("delete", (attrs) => {
       id: "delete",
       action: "deletePost",
       title: "post.controls.delete",
-      icon: "far-trash-alt",
+      icon: "trash-can",
       className: "delete",
     };
   } else if (attrs.showFlagDelete) {
@@ -475,7 +475,7 @@ registerButton("delete", (attrs) => {
       id: "delete_topic",
       action: "showDeleteTopicModal",
       title: "post.controls.delete_topic_disallowed",
-      icon: "far-trash-alt",
+      icon: "trash-can",
       className: "delete",
     };
   }
@@ -636,7 +636,7 @@ export default createWidget("post-menu", {
         action: "showMoreActions",
         title: "show_more",
         className: "show-more-actions",
-        icon: "ellipsis-h",
+        icon: "ellipsis",
       });
       visibleButtons.splice(visibleButtons.length - 1, 0, showMore);
       hasShowMoreButton = true;
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index 875eb114a51..3c6788ec35e 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -53,9 +53,9 @@ const groupActionCodes = ["invited_group", "removed_group"];
 
 const icons = {
   "closed.enabled": "lock",
-  "closed.disabled": "unlock-alt",
+  "closed.disabled": "unlock-keyhole",
   "autoclosed.enabled": "lock",
-  "autoclosed.disabled": "unlock-alt",
+  "autoclosed.disabled": "unlock-keyhole",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -66,12 +66,12 @@ const icons = {
   "banner.disabled": "thumbtack unpinned",
   "visible.enabled": "far-eye",
   "visible.disabled": "far-eye-slash",
-  split_topic: "sign-out-alt",
-  invited_user: "plus-circle",
-  invited_group: "plus-circle",
-  user_left: "minus-circle",
-  removed_user: "minus-circle",
-  removed_group: "minus-circle",
+  split_topic: "right-from-bracket",
+  invited_user: "circle-plus",
+  invited_group: "circle-plus",
+  user_left: "circle-minus",
+  removed_user: "circle-minus",
+  removed_group: "circle-minus",
   public_topic: "comment",
   private_topic: "envelope",
   autobumped: "hand-point-right",
@@ -160,7 +160,7 @@ export default createWidget("post-small-action", {
       buttons.push(
         this.attach("button", {
           className: "btn-flat small-action-recover",
-          icon: "undo",
+          icon: "arrow-rotate-left",
           action: "recoverPost",
           title: "post.controls.undelete",
         })
@@ -171,7 +171,7 @@ export default createWidget("post-small-action", {
       buttons.push(
         this.attach("button", {
           className: "btn-flat small-action-edit",
-          icon: "pencil-alt",
+          icon: "pencil",
           action: "editPost",
           title: "post.controls.edit",
         })
@@ -182,7 +182,7 @@ export default createWidget("post-small-action", {
       buttons.push(
         this.attach("button", {
           className: "btn-flat btn-danger small-action-delete",
-          icon: "trash-alt",
+          icon: "trash-can",
           action: "deletePost",
           title: "post.controls.delete",
         })
diff --git a/app/assets/javascripts/discourse/app/widgets/post-stream.js b/app/assets/javascripts/discourse/app/widgets/post-stream.js
index 923d587ab94..120ba7c5c21 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-stream.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-stream.js
@@ -176,7 +176,7 @@ createWidget("filter-show-all", {
   },
 
   html() {
-    return [iconNode("arrows-alt-v"), I18n.t("post.filtered_replies.show_all")];
+    return [iconNode("up-down"), I18n.t("post.filtered_replies.show_all")];
   },
 
   click() {
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index 6cf06cfab0b..0e79092bec7 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -221,7 +221,7 @@ createWidget("post-avatar", {
     let hideFromAnonUser =
       this.siteSettings.hide_user_profiles_from_public && !this.currentUser;
     if (!attrs.user_id) {
-      body = iconNode("far-trash-alt", { class: "deleted-user-avatar" });
+      body = iconNode("trash-can", { class: "deleted-user-avatar" });
     } else {
       body = avatarFor.call(
         this,
@@ -707,7 +707,7 @@ createWidget("post-notice", {
 
     if (attrs.notice.type === "new_user") {
       return [
-        iconNode("hands-helping"),
+        iconNode("handshake-angle"),
         h("p", I18n.t("post.notice.new_user", { user })),
       ];
     }
@@ -716,7 +716,7 @@ createWidget("post-notice", {
       const timeAgo = (new Date() - new Date(attrs.notice.lastPostedAt)) / 1000;
       const time = relativeAgeMediumSpan(timeAgo, true);
       return [
-        iconNode("far-smile"),
+        iconNode("far-face-smile"),
         h("p", I18n.t("post.notice.returning_user", { user, time })),
       ];
     }
diff --git a/app/assets/javascripts/discourse/app/widgets/poster-name.js b/app/assets/javascripts/discourse/app/widgets/poster-name.js
index cfea8a2efae..0dd6336ccd9 100644
--- a/app/assets/javascripts/discourse/app/widgets/poster-name.js
+++ b/app/assets/javascripts/discourse/app/widgets/poster-name.js
@@ -76,7 +76,7 @@ export default createWidget("poster-name", {
   // TODO: Allow extensibility
   posterGlyph(attrs) {
     if (attrs.moderator || attrs.groupModerator) {
-      return iconNode("shield-alt", {
+      return iconNode("shield-halved", {
         title: I18n.t("user.moderator_tooltip"),
       });
     }
diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index b1684d3ec9f..ce0c0c4d5ab 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -43,7 +43,7 @@ import I18n from "discourse-i18n";
         { id: 1, label: "foo.bar" },
         "separator",
         { id: 2, translatedLabel: "FooBar" },
-        { id: 3 label: "foo.baz", icon: "times" },
+        { id: 3 label: "foo.baz", icon: "xmark" },
         { id: 4, html: "<b>foo</b>" }
       ]
       ```
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-sidebar-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-sidebar-section-test.js
index 4f6e97e69a2..14663858b89 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-sidebar-section-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-sidebar-section-test.js
@@ -155,26 +155,26 @@ acceptance("Admin Sidebar - Sections - Plugin API", function (needs) {
         name: "test_section_link",
         label: "admin.plugins.title",
         route: "adminPlugins.index",
-        icon: "cog",
+        icon: "gear",
       });
 
       api.addAdminSidebarSectionLink("root", {
         name: "test_section_link_no_route_or_href",
         label: "admin.plugins.title",
-        icon: "cog",
+        icon: "gear",
       });
 
       api.addAdminSidebarSectionLink("root", {
         name: "test_section_link_no_label_or_text",
         route: "adminPlugins.index",
-        icon: "cog",
+        icon: "gear",
       });
 
       api.addAdminSidebarSectionLink("root", {
         name: "test_section_link_invalid_label",
         label: "blahblah.i18n",
         route: "adminPlugins.index",
-        icon: "cog",
+        icon: "gear",
       });
 
       api.addCommunitySectionLink(
@@ -280,7 +280,7 @@ acceptance(
           name: "test_section_link",
           label: "admin.plugins.title",
           route: "adminPlugins.index",
-          icon: "cog",
+          icon: "gear",
         });
       });
     });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
index 40b133f0d34..b54af84bb2d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
@@ -20,7 +20,7 @@ acceptance("Category Edit - Security", function (needs) {
     const badgeName = firstRow.querySelector(".group-name-label").innerText;
     assert.strictEqual(badgeName, "everyone");
 
-    assert.strictEqual(count(".d-icon-check-square"), 3);
+    assert.strictEqual(count(".d-icon-square-check"), 3);
   });
 
   test("removing a permission", async function (assert) {
@@ -63,7 +63,7 @@ acceptance("Category Edit - Security", function (needs) {
       "staff"
     );
     assert.strictEqual(
-      addedRow.querySelectorAll(".d-icon-check-square").length,
+      addedRow.querySelectorAll(".d-icon-square-check").length,
       3,
       "new row permissions match default 'everyone' permissions"
     );
@@ -93,7 +93,7 @@ acceptance("Category Edit - Security", function (needs) {
       "everyone"
     );
     assert.strictEqual(
-      firstRow.querySelectorAll(".d-icon-check-square").length,
+      firstRow.querySelectorAll(".d-icon-square-check").length,
       1,
       "adds only 'See' permission for a new row"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
index 7ff978bd411..cdf6cb9f0b8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
@@ -125,7 +125,7 @@ acceptance("Composer Actions", function (needs) {
 
     await visit("/t/internationalization-localization/280");
 
-    await click("#topic-title .d-icon-pencil-alt");
+    await click("#topic-title .d-icon-pencil");
     await categoryChooser.expand();
     await categoryChooser.selectRowByValue(4);
     await click("#topic-title .submit-edit");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-draft-saving-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-draft-saving-test.js
index c0a91ea9a7e..73f1b85ddd7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-draft-saving-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-draft-saving-test.js
@@ -40,7 +40,7 @@ acceptance("Composer - Draft saving", function (needs) {
       "the draft wasn't saved, a warning is rendered"
     );
     assert.ok(
-      exists("div#draft-status svg.d-icon-exclamation-triangle"),
+      exists("div#draft-status svg.d-icon-triangle-exclamation"),
       "an exclamation icon is rendered"
     );
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index c18b44e613a..06a84824166 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -940,7 +940,7 @@ acceptance("Composer", function (needs) {
 
     sinon.stub(Draft, "get").resolves({
       draft:
-        '{"reply":"Hey there","action":"createTopic","title":"Draft topic","categoryId":2,"tags":["fun", "times"],"archetypeId":"regular","metaData":null,"composerTime":25269,"typingTime":8100}',
+        '{"reply":"Hey there","action":"createTopic","title":"Draft topic","categoryId":2,"tags":["fun", "xmark"],"archetypeId":"regular","metaData":null,"composerTime":25269,"typingTime":8100}',
       draft_sequence: 0,
       draft_key: NEW_TOPIC_KEY,
     });
@@ -955,15 +955,15 @@ acceptance("Composer", function (needs) {
     assert.strictEqual(selectKit(".category-chooser").header().value(), "2");
     assert.strictEqual(
       selectKit(".mini-tag-chooser").header().value(),
-      "fun,times"
+      "fun,xmark"
     );
   });
 
   test("Deleting the text content of the first post in a private message", async function (assert) {
     await visit("/t/34");
 
-    await click("#post_1 .d-icon-ellipsis-h");
-    await click("#post_1 .d-icon-pencil-alt");
+    await click("#post_1 .d-icon-ellipsis");
+    await click("#post_1 .d-icon-pencil");
     await fillIn(".d-editor-input", "");
 
     assert.strictEqual(
@@ -999,7 +999,7 @@ acceptance("Composer", function (needs) {
       "save button says Save Edit"
     );
     assert.strictEqual(
-      count(".save-or-cancel button.create svg.d-icon-pencil-alt"),
+      count(".save-or-cancel button.create svg.d-icon-pencil"),
       1,
       "save button has pencil icon"
     );
@@ -1467,7 +1467,7 @@ acceptance("composer buttons API", function (needs) {
         toolbar.addButton({
           id: "smile",
           group: "extras",
-          icon: "far-smile",
+          icon: "far-face-smile",
           shortcut: "ALT+S",
           shortcutAction: (toolbarEvent) => {
             toolbarEvent.addText(":smile: from keyboard");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
index d89d1cc9eb2..6d4b8026924 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
@@ -16,7 +16,7 @@ acceptance("Group Members - Anonymous", function () {
     await visit("/g/discourse");
 
     assert.strictEqual(
-      count(".avatar-flair .d-icon-adjust"),
+      count(".avatar-flair .d-icon-circle-half-stroke"),
       1,
       "it displays the group's avatar flair"
     );
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js
index 1c75d557ccb..bacc8b9a816 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js
@@ -236,7 +236,7 @@ acceptance(
             visible: true,
             public_admission: true,
             public_exit: false,
-            flair_url: "fa-adjust",
+            flair_url: "fa-circle-half-stroke",
             is_group_owner: true,
             mentionable: true,
             messageable: true,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
index 727be141555..1fbd69b2303 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js
@@ -48,7 +48,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
             }
 
             get actionsIcon() {
-              return "cog";
+              return "gear";
             }
 
             get actions() {
@@ -195,7 +195,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
                   }
 
                   get hoverValue() {
-                    return "times";
+                    return "xmark";
                   }
 
                   get hoverAction() {
@@ -423,7 +423,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
           }
 
           get actionsIcon() {
-            return "cog";
+            return "gear";
           }
 
           get actions() {
@@ -479,7 +479,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
           }
 
           get actionsIcon() {
-            return "cog";
+            return "gear";
           }
 
           get actions() {
@@ -779,7 +779,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
             }
 
             get actionsIcon() {
-              return "cog";
+              return "gear";
             }
 
             get links() {
@@ -942,7 +942,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
             }
 
             get actionsIcon() {
-              return "cog";
+              return "gear";
             }
 
             get links() {
@@ -977,7 +977,7 @@ acceptance("Sidebar - Plugin API", function (needs) {
                   }
 
                   get prefixValue() {
-                    return "cog";
+                    return "gear";
                   }
 
                   get prefixColor() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
index f2f812b6a15..a94ea45feeb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js
@@ -159,7 +159,9 @@ acceptance(
       );
 
       assert.ok(
-        exists(".sidebar-footer-actions-toggle-mobile-view .d-icon-mobile-alt"),
+        exists(
+          ".sidebar-footer-actions-toggle-mobile-view .d-icon-mobile-screen-button"
+        ),
         "displays the mobile icon for the button"
       );
     });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-mobile-test.js
index 68d690a97ec..6a21d8c74eb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-mobile-test.js
@@ -16,7 +16,7 @@ acceptance(
       withPluginApi("0.13.1", (api) => {
         api.registerTopicFooterButton({
           id: "foo",
-          icon: "cog",
+          icon: "gear",
           action() {
             assert.step(`action called`);
             done();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-test.js
index 7bdbb5c1d9a..c04fcd9264c 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-button-api-test.js
@@ -13,7 +13,7 @@ acceptance(
       withPluginApi("0.13.1", (api) => {
         api.registerTopicFooterButton({
           id: "my-button",
-          icon: "cog",
+          icon: "gear",
           action() {
             assert.step("action called");
             done();
@@ -31,7 +31,7 @@ acceptance(
       withPluginApi("0.13.1", (api) => {
         api.registerTopicFooterButton({
           id: "my-button",
-          icon: "cog",
+          icon: "gear",
           action() {},
           anonymousOnly: true,
         });
@@ -51,7 +51,7 @@ acceptance(
       withPluginApi("0.13.1", (api) => {
         api.registerTopicFooterButton({
           id: "my-button",
-          icon: "cog",
+          icon: "gear",
           action() {
             assert.step("action called");
             done();
@@ -70,7 +70,7 @@ acceptance(
       withPluginApi("0.13.1", (api) => {
         api.registerTopicFooterButton({
           id: "my-button",
-          icon: "cog",
+          icon: "gear",
           action() {},
         });
       });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
index 7ad8eec5b01..8962bc5a244 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -104,7 +104,7 @@ acceptance("Topic", function (needs) {
   test("Showing and hiding the edit controls", async function (assert) {
     await visit("/t/internationalization-localization/280");
 
-    await click("#topic-title .d-icon-pencil-alt");
+    await click("#topic-title .d-icon-pencil");
 
     assert.ok(exists("#edit-title"), "it shows the editing controls");
     assert.ok(
@@ -122,7 +122,7 @@ acceptance("Topic", function (needs) {
 
     await visit("/t/internationalization-localization/280");
 
-    await click("#topic-title .d-icon-pencil-alt");
+    await click("#topic-title .d-icon-pencil");
     await fillIn("#edit-title", "this is the new title");
     await categoryChooser.expand();
     await categoryChooser.selectRowByValue(4);
@@ -172,7 +172,7 @@ acceptance("Topic", function (needs) {
 
   test("Updating the topic title with emojis", async function (assert) {
     await visit("/t/internationalization-localization/280");
-    await click("#topic-title .d-icon-pencil-alt");
+    await click("#topic-title .d-icon-pencil");
 
     await fillIn("#edit-title", "emojis title :bike: :blonde_woman:t6:");
 
@@ -186,7 +186,7 @@ acceptance("Topic", function (needs) {
 
   test("Updating the topic title with unicode emojis", async function (assert) {
     await visit("/t/internationalization-localization/280");
-    await click("#topic-title .d-icon-pencil-alt");
+    await click("#topic-title .d-icon-pencil");
 
     await fillIn("#edit-title", "emojis title 👨‍🌾🙏");
 
@@ -201,7 +201,7 @@ acceptance("Topic", function (needs) {
   test("Updating the topic title with unicode emojis without whitespace", async function (assert) {
     this.siteSettings.enable_inline_emoji_translation = true;
     await visit("/t/internationalization-localization/280");
-    await click("#topic-title .d-icon-pencil-alt");
+    await click("#topic-title .d-icon-pencil");
 
     await fillIn("#edit-title", "Test🙂Title");
 
@@ -258,7 +258,7 @@ acceptance("Topic", function (needs) {
     await visit("/t/topic-for-group-moderators/2480");
 
     assert.ok(exists(".category-moderator"), "it has a class applied");
-    assert.ok(exists(".d-icon-shield-alt"), "it shows an icon");
+    assert.ok(exists(".d-icon-shield-halved"), "it shows an icon");
   });
 
   test("Suspended user posts", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
index 21ee5766b13..e32cc4c93f4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -477,7 +477,7 @@ acceptance("User menu", function (needs) {
       "activity link has the right label"
     );
     assert.ok(
-      activityLink.querySelector(".d-icon-stream"),
+      activityLink.querySelector(".d-icon-bars-staggered"),
       "activity link has the right icon"
     );
 
@@ -533,7 +533,7 @@ acceptance("User menu", function (needs) {
       "preferences link has the right label"
     );
     assert.ok(
-      preferencesLink.querySelector(".d-icon-cog"),
+      preferencesLink.querySelector(".d-icon-gear"),
       "preferences link has the right icon"
     );
 
@@ -709,7 +709,7 @@ acceptance("User menu", function (needs) {
       "logout button has the right label"
     );
     assert.ok(
-      logoutButton.querySelector(".d-icon-sign-out-alt"),
+      logoutButton.querySelector(".d-icon-right-from-bracket"),
       "logout button has the right icon"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js
index e1b56a09ff9..bea7e81694e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-status-test.js
@@ -499,7 +499,7 @@ acceptance("User Status - user menu", function (needs) {
 
     assert.ok(exists("li.set-user-status .btn"), "shows the button");
     assert.ok(
-      exists("li.set-user-status svg.d-icon-plus-circle"),
+      exists("li.set-user-status svg.d-icon-circle-plus"),
       "shows the icon on the button"
     );
   });
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
index cfb5bc63af9..36b268f193f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
@@ -398,7 +398,7 @@ acceptance("User - Logout", function (needs) {
     );
     assert.strictEqual(
       query(".dialog-footer .btn-primary").innerText,
-      I18n.t("home"),
+      I18n.t("house"),
       "primary dialog button is present"
     );
 
diff --git a/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js b/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
index e944bb4081e..bcced94920a 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js
@@ -75,7 +75,7 @@ export default {
         grant_count: 10,
         allow_title: true,
         multiple_grant: false,
-        icon: "fa-cog",
+        icon: "fa-gear",
         listable: true,
         enabled: true,
         badge_grouping_id: 8,
diff --git a/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
index 7f8e679322f..ec2d46c6351 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
@@ -42,7 +42,7 @@ export default {
       visible: true,
       public_admission: true,
       public_exit: false,
-      flair_url: "fa-adjust",
+      flair_url: "fa-circle-half-stroke",
       is_group_owner: true,
       mentionable: true,
       messageable: true,
@@ -66,7 +66,7 @@ export default {
       visible: true,
       public_admission: true,
       public_exit: false,
-      flair_url: "fa-adjust",
+      flair_url: "fa-circle-half-stroke",
       is_group_owner: true,
       mentionable: true,
       messageable: true,
@@ -1334,7 +1334,7 @@ export default {
       has_messages: true,
       public_admission: true,
       public_exit: false,
-      flair_url: "fa-adjust",
+      flair_url: "fa-circle-half-stroke",
       is_group_owner: true,
       mentionable: true,
       messageable: true,
diff --git a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
index 14a8e5bd8c4..dd9ba030749 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
@@ -78,7 +78,7 @@ export default {
               id: 331,
               name: "About",
               value: "/about",
-              icon: "info-circle",
+              icon: "circle-info",
               external: false,
               segment: "secondary",
             },
@@ -86,7 +86,7 @@ export default {
               id: 332,
               name: "Faq",
               value: "/faq",
-              icon: "question-circle",
+              icon: "circle-question",
               external: false,
               segment: "secondary",
             },
@@ -118,7 +118,7 @@ export default {
               id: 336,
               name: "Groups",
               value: "/g",
-              icon: "user-friends",
+              icon: "user-group",
               external: false,
               segment: "secondary",
             },
diff --git a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
index 514dbd9f674..3bc16c5544d 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js
@@ -752,7 +752,7 @@ export default {
               id: 331,
               name: "About",
               value: "/about",
-              icon: "info-circle",
+              icon: "circle-info",
               external: false,
               segment: "secondary",
             },
@@ -760,7 +760,7 @@ export default {
               id: 332,
               name: "Faq",
               value: "/faq",
-              icon: "question-circle",
+              icon: "circle-question",
               external: false,
               segment: "secondary",
             },
@@ -792,7 +792,7 @@ export default {
               id: 336,
               name: "Groups",
               value: "/g",
-              icon: "user-friends",
+              icon: "user-group",
               external: false,
               segment: "secondary",
             },
diff --git a/app/assets/javascripts/discourse/tests/helpers/review-pretender.js b/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
index e1952574eab..1cb6bcbfa7a 100644
--- a/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/review-pretender.js
@@ -60,7 +60,7 @@ export default function (helpers) {
         },
         {
           id: "reject_user",
-          icon: "user-times",
+          icon: "user-xmark",
           label: "Delete User...",
           action_ids: ["reject_user_delete", "reject_user_block"],
         },
@@ -78,7 +78,7 @@ export default function (helpers) {
         },
         {
           id: "reject_user_delete",
-          icon: "user-times",
+          icon: "user-xmark",
           button_class: null,
           label: "Delete User",
           description: "The user will be deleted from the forum.",
diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-page-header-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/admin-page-header-test.gjs
index e8d3d5eb413..f6768b65946 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/admin-page-header-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/admin-page-header-test.gjs
@@ -148,7 +148,7 @@ module("Integration | Component | AdminPageHeader", function (hooks) {
             @action={{someAction}}
             @title="admin.badges.group_settings"
             @label="admin.badges.group_settings"
-            @icon="cog"
+            @icon="gear"
             class="edit-groupings-btn"
           />
         </:actions>
diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-page-subheader-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/admin-page-subheader-test.gjs
index 50e7d4eabf5..d705317e24b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/admin-page-subheader-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/admin-page-subheader-test.gjs
@@ -100,7 +100,7 @@ module("Integration | Component | AdminPageSubheader", function (hooks) {
             @action={{someAction}}
             @title="admin.badges.group_settings"
             @label="admin.badges.group_settings"
-            @icon="cog"
+            @icon="gear"
             class="edit-groupings-btn"
           />
         </:actions>
diff --git a/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js
index 355ac765cd0..e68d3231646 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js
@@ -52,11 +52,11 @@ module("Integration | Component | badge-button", function (hooks) {
   });
 
   test("icon", async function (assert) {
-    this.set("badge", { icon: "times" });
+    this.set("badge", { icon: "xmark" });
 
     await render(hbs`<BadgeButton @badge={{this.badge}} />`);
 
-    assert.ok(exists(".d-icon.d-icon-times"));
+    assert.ok(exists(".d-icon.d-icon-xmark"));
   });
 
   test("accepts block", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
index 418571ba9d4..6bb6a7eb239 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
@@ -651,7 +651,7 @@ third line`
       api.onToolbarCreate((toolbar) => {
         toolbar.addButton({
           id: "replace-text",
-          icon: "times",
+          icon: "xmark",
           group: "extras",
           action: () => {
             toolbar.context.newToolbarEvent().replaceText("hello", "goodbye");
@@ -690,7 +690,7 @@ third line`
         toolbar.addButton({
           id: "emoji",
           group: "extras",
-          icon: "far-smile",
+          icon: "far-face-smile",
           action: () => toolbar.context.send("emoji"),
         });
       });
@@ -732,7 +732,7 @@ third line`
         toolbar.addButton({
           id: "shown",
           group: "extras",
-          icon: "far-smile",
+          icon: "far-face-smile",
           action: () => {},
           condition: () => true,
         });
@@ -740,7 +740,7 @@ third line`
         toolbar.addButton({
           id: "not-shown",
           group: "extras",
-          icon: "far-frown",
+          icon: "far-face-frown",
           action: () => {},
           condition: () => false,
         });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js b/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
index 91ef1a66d0c..912556ef807 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/dialog-holder-test.js
@@ -271,7 +271,7 @@ module("Integration | Component | dialog-holder", function (hooks) {
       message: "An alert with custom buttons",
       buttons: [
         {
-          icon: "cog",
+          icon: "gear",
           label: "Danger ahead",
           class: "btn-danger",
           action: () => {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-default-toast-test.js b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-default-toast-test.js
index 7accec99cdc..6b36a901553 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-default-toast-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-default-toast-test.js
@@ -87,7 +87,7 @@ module(
           actions: [
             {
               label: "cancel",
-              icon: "times",
+              icon: "xmark",
               class: "btn-danger",
               action: () => {},
             },
diff --git a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
index f140460cc15..b73488cf94b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
@@ -235,11 +235,11 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {
 
   test("content close argument", async function (assert) {
     await render(
-      hbs`<DMenu @inline={{true}}><:trigger>test</:trigger><:content as |args|><DButton @icon="times" @action={{args.close}} /></:content></DMenu>`
+      hbs`<DMenu @inline={{true}}><:trigger>test</:trigger><:content as |args|><DButton @icon="xmark" @action={{args.close}} /></:content></DMenu>`
     );
     await open();
 
-    await click(".d-icon-times");
+    await click(".d-icon-xmark");
 
     assert.dom(".fk-d-menu").doesNotExist();
   });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/icon-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/icon-test.gjs
index 0d7b51ce7f4..d7af26fbdf2 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/icon-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-kit/controls/icon-test.gjs
@@ -10,7 +10,7 @@ module("Integration | Component | FormKit | Controls | Icon", function (hooks) {
 
   hooks.beforeEach(function () {
     pretender.get("/svg-sprite/picker-search", () =>
-      response(200, [{ id: "pencil-alt", name: "pencil-alt" }])
+      response(200, [{ id: "pencil", name: "pencil" }])
     );
   });
 
@@ -26,10 +26,10 @@ module("Integration | Component | FormKit | Controls | Icon", function (hooks) {
       </Form>
     </template>);
 
-    await formKit().field("foo").select("pencil-alt");
+    await formKit().field("foo").select("pencil");
     await formKit().submit();
 
-    assert.deepEqual(data.foo, "pencil-alt");
-    assert.form().field("foo").hasValue("pencil-alt");
+    assert.deepEqual(data.foo, "pencil");
+    assert.form().field("foo").hasValue("pencil");
   });
 });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/alert-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/alert-test.gjs
index 0a97459820e..f373347230e 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/alert-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/alert-test.gjs
@@ -19,11 +19,11 @@ module("Integration | Component | FormKit | Layout | Alert", function (hooks) {
   test("@icon", async function (assert) {
     await render(<template>
       <Form as |form|>
-        <form.Alert @icon="pencil-alt">Test</form.Alert>
+        <form.Alert @icon="pencil">Test</form.Alert>
       </Form>
     </template>);
 
-    assert.dom(".form-kit__alert .d-icon-pencil-alt").exists();
+    assert.dom(".form-kit__alert .d-icon-pencil").exists();
   });
 
   test("@type", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs
index 95145378e09..a55c81384e9 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs
@@ -62,7 +62,7 @@ module("Integration | Component | home-logo", function (hooks) {
     this.siteSettings.title = title;
 
     await render(<template><HomeLogo @minimized={{true}} /></template>);
-    assert.dom(".d-icon-home").exists({ count: 1 });
+    assert.dom(".d-icon-house").exists({ count: 1 });
   });
 
   test("mobile logo", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
index f63a76b024b..8526af9ba9f 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
@@ -66,8 +66,8 @@ module("Integration | Component | select-kit/combo-box", function (hooks) {
 
   test("options.{caretUpIcon,caretDownIcon}", async function (assert) {
     setDefaultState(this, {
-      caretUpIcon: "pencil-alt",
-      caretDownIcon: "trash-alt",
+      caretUpIcon: "pencil",
+      caretDownIcon: "trash-can",
     });
 
     await render(hbs`
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js
index 3586b9a6fe2..64700081296 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js
@@ -67,7 +67,7 @@ module(
           @value={{this.value}}
           @content={{this.content}}
           @options={{hash
-            icon="times"
+            icon="xmark"
             showFullTitle=this.showFullTitle
             none=this.none
           }}
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
index bd79dd0a83c..e5ec56fea69 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
@@ -327,7 +327,7 @@ module("Integration | Component | select-kit/single-select", function (hooks) {
     });
 
     await render(hbs`
-      <DButton @icon="times" @action={{this.onClick}}>
+      <DButton @icon="xmark" @action={{this.onClick}}>
         <SingleSelect
           @value={{this.value}}
           @content={{this.content}}
diff --git a/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js
index ea09ee97a89..d2b87090862 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js
@@ -25,7 +25,11 @@ module("Integration | Component | themes-list-item", function (hooks) {
 
     await render(hbs`<ThemesListItem @theme={{this.theme}} />`);
 
-    assert.strictEqual(count(".d-icon-sync"), 1, "shows pending update icon");
+    assert.strictEqual(
+      count(".d-icon-arrows-rotate"),
+      1,
+      "shows pending update icon"
+    );
   });
 
   test("broken theme", async function (assert) {
@@ -40,7 +44,7 @@ module("Integration | Component | themes-list-item", function (hooks) {
     await render(hbs`<ThemesListItem @theme={{this.theme}} />`);
 
     assert.strictEqual(
-      count(".d-icon-exclamation-circle"),
+      count(".d-icon-circle-exclamation"),
       1,
       "shows broken theme icon"
     );
diff --git a/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js b/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js
index 60f9bc55bdc..12c6cf8a515 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js
@@ -19,7 +19,7 @@ module("Integration | Component | uppy-image-uploader", function (hooks) {
     );
 
     assert.strictEqual(
-      count(".d-icon-far-trash-alt"),
+      count(".d-icon-trash-can"),
       1,
       "it displays the trash icon"
     );
@@ -47,10 +47,7 @@ module("Integration | Component | uppy-image-uploader", function (hooks) {
       "it displays the upload icon"
     );
 
-    assert.ok(
-      !exists(".d-icon-far-trash-alt"),
-      "it does not display trash icon"
-    );
+    assert.ok(!exists(".d-icon-trash-can"), "it does not display trash icon");
 
     assert.ok(
       !exists(".image-uploader-lightbox-btn"),
@@ -69,10 +66,7 @@ module("Integration | Component | uppy-image-uploader", function (hooks) {
       "it displays the upload icon"
     );
 
-    assert.ok(
-      !exists(".d-icon-far-trash-alt"),
-      "it does not display trash icon"
-    );
+    assert.ok(!exists(".d-icon-trash-can"), "it does not display trash icon");
 
     assert.ok(
       !exists(".image-uploader-lightbox-btn"),
diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
index 18c0ae1c9f8..a6d82a32ecd 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
@@ -164,7 +164,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
       moderator: false,
       trust_level: 3,
       flair_name: "Band Geeks",
-      flair_url: "fa-times",
+      flair_url: "fa-xmark",
       flair_bg_color: "123456",
       flair_color: "B0B0B0",
       flair_group_id: 41,
@@ -175,7 +175,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
     await render(hbs`<UserAvatarFlair @user={{this.args}} />`);
 
     assert.ok(exists(".avatar-flair"), "it has the tag");
-    assert.ok(exists("svg.d-icon-times"), "it has the svg icon");
+    assert.ok(exists("svg.d-icon-xmark"), "it has the svg icon");
     assert.strictEqual(
       query(".avatar-flair").getAttribute("style"),
       "background-color: #123456; color: #B0B0B0; ",
diff --git a/app/assets/javascripts/discourse/tests/integration/components/webhook-status-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/webhook-status-test.gjs
index facdec89e79..034828137ae 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/webhook-status-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/webhook-status-test.gjs
@@ -48,7 +48,7 @@ module("Integration | Component | webhook-status", function (hooks) {
 
     await rerender();
 
-    assert.dom(".d-icon-times-circle").exists();
+    assert.dom(".d-icon-circle-xmark").exists();
   });
 
   test("iconClass", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js
index a8f70d05316..9ff9ed32ae7 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js
@@ -19,7 +19,7 @@ module("Integration | Component | Widget | actions-summary", function (hooks) {
     );
 
     assert.strictEqual(
-      count(".post-action .d-icon-far-trash-alt"),
+      count(".post-action .d-icon-trash-can"),
       1,
       "it has the deleted icon"
     );
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js
index f4c52fac362..ea9545329cf 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js
@@ -8,12 +8,15 @@ module("Integration | Component | Widget | button", function (hooks) {
   setupRenderingTest(hooks);
 
   test("icon only button", async function (assert) {
-    this.set("args", { icon: "far-smile" });
+    this.set("args", { icon: "far-face-smile" });
 
     await render(hbs`<MountWidget @widget="button" @args={{this.args}} />`);
 
     assert.ok(exists("button.btn.btn-icon.no-text"), "it has all the classes");
-    assert.ok(exists("button .d-icon.d-icon-far-smile"), "it has the icon");
+    assert.ok(
+      exists("button .d-icon.d-icon-far-face-smile"),
+      "it has the icon"
+    );
   });
 
   test("icon and text button", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js
index c79d4a18acb..0fdbe5004bf 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js
@@ -21,7 +21,7 @@ module("Integration | Component | Widget | post-menu", function (hooks) {
       api.addPostMenuButton("coffee", () => {
         return {
           action: "drinkCoffee",
-          icon: "coffee",
+          icon: "mug-saucer",
           className: "hot-coffee",
           title: "coffee.title",
           position: "first",
@@ -50,7 +50,7 @@ module("Integration | Component | Widget | post-menu", function (hooks) {
             testPost = post;
             showFeedback("coffee.drink");
           },
-          icon: "coffee",
+          icon: "mug-saucer",
           className: "hot-coffee",
           title: "coffee.title",
           position: "first",
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js
index 765a15d238b..9bcd6fa3828 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js
@@ -35,7 +35,7 @@ module("Integration | Component | Widget | post-stream", function (hooks) {
           lastTransformedPost = transformedPost;
           return {
             action: "drinkCoffee",
-            icon: "coffee",
+            icon: "mug-saucer",
             className: "hot-coffee",
             title: "coffee.title",
             position: "first",
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js
index 7da978f466d..cb6b30b717b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js
@@ -44,7 +44,7 @@ module("Integration | Component | Widget | poster-name", function (hooks) {
     assert.ok(exists("span.staff"));
     assert.ok(exists("span.admin"));
     assert.ok(exists("span.moderator"));
-    assert.ok(exists(".d-icon-shield-alt"));
+    assert.ok(exists(".d-icon-shield-halved"));
     assert.ok(exists("span.new-user"));
     assert.ok(exists("span.group--fish"));
   });
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js
index c5a6422a69d..d475ced78e1 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js
@@ -27,7 +27,7 @@ module("Integration | Component | Widget | topic-status", function (hooks) {
     const store = getOwner(this).lookup("service:store");
     TopicStatusIcons.addObject([
       "has_accepted_answer",
-      "far-check-square",
+      "far-square-check",
       "solved",
     ]);
     this.set("args", {
@@ -41,7 +41,7 @@ module("Integration | Component | Widget | topic-status", function (hooks) {
       hbs`<MountWidget @widget="topic-status" @args={{this.args}} />`
     );
 
-    assert.ok(exists(".topic-status .d-icon-far-check-square"));
+    assert.ok(exists(".topic-status .d-icon-far-square-check"));
   });
 
   test("toggling pin status", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js
index be455b815ec..5c0a0893a24 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js
@@ -10,7 +10,7 @@ const DEFAULT_CONTENT = {
     { id: 1, label: "foo" },
     { id: 2, translatedLabel: "FooBar" },
     "separator",
-    { id: 3, translatedLabel: "With icon", icon: "times" },
+    { id: 3, translatedLabel: "With icon", icon: "xmark" },
     { id: 4, html: "<b>baz</b>" },
     { id: 5, translatedLabel: "Disabled", disabled: true },
   ],
@@ -148,11 +148,11 @@ module("Integration | Component | Widget | widget-dropdown", function (hooks) {
 
   test("icon", async function (assert) {
     this.setProperties(DEFAULT_CONTENT);
-    this.set("icon", "times");
+    this.set("icon", "xmark");
 
     await render(TEMPLATE);
 
-    assert.ok(exists(header().querySelector(".d-icon-times")));
+    assert.ok(exists(header().querySelector(".d-icon-xmark")));
   });
 
   test("class", async function (assert) {
@@ -189,7 +189,7 @@ module("Integration | Component | Widget | widget-dropdown", function (hooks) {
     await render(TEMPLATE);
 
     await toggle();
-    assert.ok(exists(rowById(3).querySelector(".d-icon-times")));
+    assert.ok(exists(rowById(3).querySelector(".d-icon-xmark")));
   });
 
   test("content with html", async function (assert) {
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js b/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js
index 78a9fd64b20..e869b8fd0f2 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/icon-library-test.js
@@ -1,5 +1,6 @@
 import { setupTest } from "ember-qunit";
 import { module, test } from "qunit";
+import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
 import {
   convertIconClass,
   iconHTML,
@@ -47,21 +48,23 @@ module("Unit | Utility | icon-library", function (hooks) {
   });
 
   test("fa5 remaps", function (assert) {
-    const adjustIcon = iconHTML("adjust");
-    assert.true(adjustIcon.includes("d-icon-adjust"), "class is maintained");
-    assert.true(
-      adjustIcon.includes('href="#circle-half-stroke"'),
-      "has remapped icon"
-    );
+    withSilencedDeprecations("discourse.fontawesome-6-upgrade", () => {
+      const adjustIcon = iconHTML("adjust");
+      assert.true(adjustIcon.includes("d-icon-adjust"), "class is maintained");
+      assert.true(
+        adjustIcon.includes('href="#circle-half-stroke"'),
+        "has remapped icon"
+      );
 
-    const farIcon = iconHTML("far-dot-circle");
-    assert.true(
-      farIcon.includes("d-icon-far-dot-circle"),
-      "class is maintained"
-    );
-    assert.true(
-      farIcon.includes('href="#far-circle-dot"'),
-      "has remapped icon"
-    );
+      const farIcon = iconHTML("far-dot-circle");
+      assert.true(
+        farIcon.includes("d-icon-far-dot-circle"),
+        "class is maintained"
+      );
+      assert.true(
+        farIcon.includes('href="#far-circle-dot"'),
+        "has remapped icon"
+      );
+    });
   });
 });
diff --git a/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs b/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs
index 8d89f00fa03..68336795675 100644
--- a/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs
+++ b/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs
@@ -55,7 +55,7 @@ const DDefaultToast = <template>
       {{/if}}
     </div>
     <div class="fk-d-default-toast__close-container">
-      <DButton class="btn-transparent" @icon="times" @action={{@close}} />
+      <DButton class="btn-transparent" @icon="xmark" @action={{@close}} />
     </div>
   </div>
 </template>;
diff --git a/app/assets/javascripts/float-kit/addon/services/toasts.js b/app/assets/javascripts/float-kit/addon/services/toasts.js
index 102f5ffa5da..684a60d324e 100644
--- a/app/assets/javascripts/float-kit/addon/services/toasts.js
+++ b/app/assets/javascripts/float-kit/addon/services/toasts.js
@@ -74,7 +74,7 @@ export default class Toasts extends Service {
   @action
   error(options = {}) {
     options.data.theme = "error";
-    options.data.icon ??= "exclamation-triangle";
+    options.data.icon ??= "triangle-exclamation";
 
     return this.show(options);
   }
@@ -89,7 +89,7 @@ export default class Toasts extends Service {
   @action
   warning(options = {}) {
     options.data.theme = "warning";
-    options.data.icon ??= "exclamation-circle";
+    options.data.icon ??= "circle-exclamation";
 
     return this.show(options);
   }
@@ -104,7 +104,7 @@ export default class Toasts extends Service {
   @action
   info(options = {}) {
     options.data.theme = "info";
-    options.data.icon ??= "info-circle";
+    options.data.icon ??= "circle-info";
 
     return this.show(options);
   }
diff --git a/app/assets/javascripts/select-kit/addon/components/bulk-select-bookmarks-dropdown.js b/app/assets/javascripts/select-kit/addon/components/bulk-select-bookmarks-dropdown.js
index a1e66276d7d..da98f1291a7 100644
--- a/app/assets/javascripts/select-kit/addon/components/bulk-select-bookmarks-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/bulk-select-bookmarks-dropdown.js
@@ -37,7 +37,7 @@ export default class BulkSelectBookmarksDropdown extends DropdownSelectBoxCompon
       },
       {
         id: "delete-bookmarks",
-        icon: "trash-alt",
+        icon: "trash-can",
         name: i18n("bookmark_bulk_actions.delete_bookmarks.name"),
       },
     ]);
diff --git a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
index 22bdaf63934..8cf9044c711 100644
--- a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
@@ -30,7 +30,7 @@ export default class CategoriesAdminDropdown extends DropdownSelectBoxComponent
       id: "reorder",
       name: I18n.t("categories.reorder.title"),
       description: I18n.t("categories.reorder.title_long"),
-      icon: "random",
+      icon: "shuffle",
     });
 
     return items;
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs b/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs
index 41fbbfd807a..dcc84e42c2f 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs
@@ -43,12 +43,12 @@ export default class CategoryDropMoreCollection extends Component {
         {{#if @selectKit.options.parentCategory}}
           <LinkTo @route="discovery.subcategories" @model={{this.slugPath}}>
             {{i18n "categories.view_all"}}
-            {{icon "external-link-alt"}}
+            {{icon "up-right-from-square"}}
           </LinkTo>
         {{else}}
           <LinkTo @route="discovery.categories">
             {{i18n "categories.view_all"}}
-            {{icon "external-link-alt"}}
+            {{icon "up-right-from-square"}}
           </LinkTo>
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
index 0621ecc7ddd..84d185e2ecd 100644
--- a/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/combo-box/combo-box-header.hbs
@@ -10,7 +10,7 @@
 
   {{#if this.shouldDisplayClearableButton}}
     <DButton
-      @icon="times"
+      @icon="xmark"
       @action={{this.selectKit.onClearSelection}}
       @ariaLabel="clear_input"
       class="btn-clear"
diff --git a/app/assets/javascripts/select-kit/addon/components/composer-actions.js b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
index af51b92d88e..ba780b19c63 100644
--- a/app/assets/javascripts/select-kit/addon/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/addon/components/composer-actions.js
@@ -68,7 +68,7 @@ export default class ComposerActions extends DropdownSelectBoxComponent {
     } else if (isInSlowMode) {
       return "hourglass-start";
     } else if (isEditing) {
-      return "pencil-alt";
+      return "pencil";
     } else {
       return "share";
     }
diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
index 41d01e82cc8..6d56b45927e 100644
--- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.hbs
@@ -3,7 +3,7 @@
     {{#each this.tags as |tag|}}
       <DButton
         @translatedTitle={{tag.value}}
-        @icon="times"
+        @icon="xmark"
         @action={{fn (action this.selectKit.deselect) tag.value}}
         tabindex="0"
         class={{tag.classNames}}
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.hbs
index 86039b67b7f..f2ac08c32ef 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select/selected-category.hbs
@@ -8,6 +8,6 @@
 >
   <div class="body">
     {{this.badge}}
-    {{d-icon "times"}}
+    {{d-icon "xmark"}}
   </div>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
index ee3ff28269f..82c5ab7dc38 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -93,7 +93,7 @@ function protoProp(prototype, key, descriptor) {
   translatedNone: null,
   filterable: false,
   autoFilterable: "autoFilterable",
-  filterIcon: "search",
+  filterIcon: "magnifying-glass",
   filterPlaceholder: null,
   translatedFilterPlaceholder: null,
   icon: null,
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs b/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
index e359dce5ef4..c5534adb309 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/selected-choice.hbs
@@ -13,7 +13,7 @@
     id="{{this.id}}-choice"
     class="btn btn-default selected-choice {{this.extraClass}}"
   >
-    {{d-icon "times"}}
+    {{d-icon "xmark"}}
     {{#if (has-block)}}
       {{yield}}
     {{else}}
diff --git a/app/assets/javascripts/select-kit/addon/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
index c9628d840ea..e475f616579 100644
--- a/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/addon/components/selected-name.hbs
@@ -24,7 +24,7 @@
 
     {{#if this.shouldDisplayClearableButton}}
       <DButton
-        @icon="times"
+        @icon="xmark"
         @action={{fn this.selectKit.deselect this.item}}
         @ariaLabel="clear_input"
         class="btn-clear"
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 7a9de7ecb3a..9997e185a30 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -806,7 +806,7 @@ section.details {
   .d-icon-check {
     color: var(--success);
   }
-  .d-icon-times {
+  .d-icon-xmark {
     color: var(--danger);
   }
 }
diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index f964644ed59..cc3130d08f6 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -260,7 +260,7 @@
       }
     }
 
-    .d-icon-exclamation-triangle {
+    .d-icon-triangle-exclamation {
       color: var(--danger);
     }
 
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index e7c0fbf2fb1..a266ace7623 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -411,7 +411,7 @@ html.composer-open {
 
   #draft-status {
     margin-left: auto;
-    .d-icon-user-edit {
+    .d-icon-user-pen {
       color: var(--danger);
       font-size: 20px;
       vertical-align: -5.5px;
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index 89230ef0f7f..85b8d210315 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -98,7 +98,7 @@ div.edit-category {
       .permission {
         margin-left: 20px;
       }
-      .d-icon-times-circle {
+      .d-icon-circle-xmark {
         margin-left: 5px;
         color: var(--danger);
       }
@@ -227,8 +227,8 @@ div.edit-category {
     .btn-flat:hover {
       background-color: transparent;
     }
-    .btn-flat .d-icon-check-square,
-    .btn-flat:hover .d-icon-check-square {
+    .btn-flat .d-icon-square-check,
+    .btn-flat:hover .d-icon-square-check {
       color: var(--success);
     }
   }
diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index 47a2992824e..7cb48ffc5f7 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -14,7 +14,7 @@
   }
   .desc {
     margin-top: 16px;
-    .d-icon-check-circle {
+    .d-icon-circle-check {
       color: var(--success);
     }
   }
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 89c010dc480..e34f56ea325 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -88,7 +88,7 @@
     @include ellipsis;
   }
 
-  .d-icon-home {
+  .d-icon-house {
     font-size: var(--font-up-6);
   }
 
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index 6959a71547e..0bcca94736b 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -2,7 +2,7 @@
 
 .rtl {
   .d-icon-align-right,
-  .d-icon-angle-double-right,
+  .d-icon-angles-right,
   .d-icon-angle-right,
   .d-icon-arrow-right,
   .d-icon-caret-right,
@@ -13,7 +13,7 @@
   }
 
   .d-icon-align-left,
-  .d-icon-angle-double-left,
+  .d-icon-angles-left,
   .d-icon-angle-left,
   .d-icon-arrow-left,
   .d-icon-caret-left,
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 6e7f02e4a5e..074ee5b62ac 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -309,7 +309,7 @@ $search-pad-horizontal: 0.5em;
         .d-icon-tag {
           font-size: 0.7em;
         }
-        .d-icon-search {
+        .d-icon-magnifying-glass {
           font-size: var(--font-down-1);
         }
       }
diff --git a/app/assets/stylesheets/common/base/sidebar-section.scss b/app/assets/stylesheets/common/base/sidebar-section.scss
index d476c2b5759..414a6b70ecf 100644
--- a/app/assets/stylesheets/common/base/sidebar-section.scss
+++ b/app/assets/stylesheets/common/base/sidebar-section.scss
@@ -156,7 +156,7 @@
 }
 
 .sidebar-section-header-global-indicator__content {
-  .d-icon-shield-alt {
+  .d-icon-shield-halved {
     padding-right: 0.25rem;
   }
 }
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index d197da5e9c8..296d2c87a8f 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -175,7 +175,7 @@
     &.d-icon-heart {
       color: var(--love);
     }
-    &.d-icon-far-trash-alt {
+    &.d-icon-trash-can {
       color: var(--secondary);
     }
   }
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 855c4e632b3..228ff08c3f2 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -277,7 +277,7 @@
       cursor: pointer;
       color: var(--danger);
 
-      .d-icon-trash-alt {
+      .d-icon-trash-can {
         margin-left: 0.5em;
       }
     }
diff --git a/app/assets/stylesheets/common/form-kit/_errors-summary.scss b/app/assets/stylesheets/common/form-kit/_errors-summary.scss
index 38473b3f80d..d1deb25ceee 100644
--- a/app/assets/stylesheets/common/form-kit/_errors-summary.scss
+++ b/app/assets/stylesheets/common/form-kit/_errors-summary.scss
@@ -6,7 +6,7 @@
   border-radius: var(--d-border-radius);
   box-sizing: border-box;
 
-  .d-icon-exclamation-triangle {
+  .d-icon-triangle-exclamation {
     color: var(--danger);
   }
 
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index b46d054f3d2..244c456cce4 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -114,7 +114,7 @@
       outline: none;
       min-width: 0;
 
-      &:focus .d-icon-times {
+      &:focus .d-icon-xmark {
         color: var(--danger);
       }
 
diff --git a/app/models/concerns/reports/users_by_type.rb b/app/models/concerns/reports/users_by_type.rb
index 5fd407dd3f5..a7c77cc7eb4 100644
--- a/app/models/concerns/reports/users_by_type.rb
+++ b/app/models/concerns/reports/users_by_type.rb
@@ -23,7 +23,7 @@ module Reports::UsersByType
       if admins > 0
         report.data << {
           url: url.call("admins"),
-          icon: "shield-alt",
+          icon: "shield-halved",
           key: "admins",
           x: label.call("admin"),
           y: admins,
@@ -34,7 +34,7 @@ module Reports::UsersByType
       if moderators > 0
         report.data << {
           url: url.call("moderators"),
-          icon: "shield-alt",
+          icon: "shield-halved",
           key: "moderators",
           x: label.call("moderator"),
           y: moderators,
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 2f3179450ef..0a790951d12 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -664,12 +664,12 @@ class Reviewable < ActiveRecord::Base
     bundle ||=
       actions.add_bundle(
         "reject_user",
-        icon: "user-times",
+        icon: "user-xmark",
         label: "reviewables.actions.reject_user.title",
       )
 
     actions.add(:delete_user, bundle: bundle) do |a|
-      a.icon = "user-times"
+      a.icon = "user-xmark"
       a.label = "reviewables.actions.reject_user.delete.title"
       a.require_reject_reason = require_reject_reason
     end
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index 73b380fe8e9..6fb8e89700b 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -63,20 +63,20 @@ class ReviewableFlaggedPost < Reviewable
       build_action(
         actions,
         :agree_and_edit,
-        icon: "pencil-alt",
+        icon: "pencil",
         bundle: agree_bundle,
         client_action: "edit",
       )
     end
 
     if guardian.can_delete_post_or_topic?(post)
-      build_action(actions, :delete_and_agree, icon: "far-trash-alt", bundle: agree_bundle)
+      build_action(actions, :delete_and_agree, icon: "trash-can", bundle: agree_bundle)
 
       if post.reply_count > 0
         build_action(
           actions,
           :delete_and_agree_replies,
-          icon: "far-trash-alt",
+          icon: "trash-can",
           bundle: agree_bundle,
           confirm: true,
         )
@@ -117,15 +117,15 @@ class ReviewableFlaggedPost < Reviewable
       )
 
     if !post.hidden? || guardian.user.is_system_user?
-      build_action(actions, :ignore_and_do_nothing, icon: "external-link-alt", bundle: ignore)
+      build_action(actions, :ignore_and_do_nothing, icon: "up-right-from-square", bundle: ignore)
     end
     if guardian.can_delete_post_or_topic?(post)
-      build_action(actions, :delete_and_ignore, icon: "far-trash-alt", bundle: ignore)
+      build_action(actions, :delete_and_ignore, icon: "trash-can", bundle: ignore)
       if post.reply_count > 0
         build_action(
           actions,
           :delete_and_ignore_replies,
-          icon: "far-trash-alt",
+          icon: "trash-can",
           confirm: true,
           bundle: ignore,
         )
diff --git a/app/models/reviewable_post.rb b/app/models/reviewable_post.rb
index 4ace91c312d..b9f7d3653ea 100644
--- a/app/models/reviewable_post.rb
+++ b/app/models/reviewable_post.rb
@@ -40,14 +40,14 @@ class ReviewablePost < Reviewable
     reject =
       actions.add_bundle(
         "#{id}-reject",
-        icon: "times",
+        icon: "xmark",
         label: "reviewables.actions.reject.bundle_title",
       )
 
     if post.trashed?
-      build_action(actions, :reject_and_keep_deleted, icon: "trash-alt", bundle: reject)
+      build_action(actions, :reject_and_keep_deleted, icon: "trash-can", bundle: reject)
     elsif guardian.can_delete_post_or_topic?(post)
-      build_action(actions, :reject_and_delete, icon: "trash-alt", bundle: reject)
+      build_action(actions, :reject_and_delete, icon: "trash-can", bundle: reject)
     end
 
     if guardian.can_suspend?(target_created_by)
diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rb
index 76ce590d165..44f3a0ccbab 100644
--- a/app/models/reviewable_queued_post.rb
+++ b/app/models/reviewable_queued_post.rb
@@ -56,14 +56,14 @@ class ReviewableQueuedPost < Reviewable
           actions.add_bundle("#{id}-reject", label: "reviewables.actions.reject_post.title")
 
         actions.add(:reject_post, bundle: reject_bundle) do |a|
-          a.icon = "times"
+          a.icon = "xmark"
           a.label = "reviewables.actions.discard_post.title"
           a.button_class = "reject-post"
         end
         delete_user_actions(actions, reject_bundle)
       else
         actions.add(:reject_post) do |a|
-          a.icon = "times"
+          a.icon = "xmark"
           a.label = "reviewables.actions.reject_post.title"
         end
       end
diff --git a/app/models/sidebar_url.rb b/app/models/sidebar_url.rb
index b3a12d99094..0c0d1d16cac 100644
--- a/app/models/sidebar_url.rb
+++ b/app/models/sidebar_url.rb
@@ -25,16 +25,16 @@ class SidebarUrl < ActiveRecord::Base
     {
       name: "About",
       path: "/about",
-      icon: "info-circle",
+      icon: "circle-info",
       segment: SidebarUrl.segments["secondary"],
     },
     {
       name: "FAQ",
       path: "/faq",
-      icon: "question-circle",
+      icon: "circle-question",
       segment: SidebarUrl.segments["secondary"],
     },
-    { name: "Groups", path: "/g", icon: "user-friends", segment: SidebarUrl.segments["secondary"] },
+    { name: "Groups", path: "/g", icon: "user-group", segment: SidebarUrl.segments["secondary"] },
     {
       name: "Badges",
       path: "/badges",
diff --git a/app/views/static/show.html.erb b/app/views/static/show.html.erb
index 711b8b6d112..1b75b979a8d 100644
--- a/app/views/static/show.html.erb
+++ b/app/views/static/show.html.erb
@@ -22,7 +22,7 @@
 
   <% if staff? %>
     <p><a href='<%= @topic.url %>'>
-      <svg class="fa d-icon d-icon-pencil-alt svg-icon" xmlns="http://www.w3.org/2000/svg">
+      <svg class="fa d-icon d-icon-pencil svg-icon" xmlns="http://www.w3.org/2000/svg">
         <use href="#pencil"></use>
       </svg>
       <%= t 'edit_this_page' %>
diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb
index a9647d9492b..d3488b254ba 100644
--- a/db/fixtures/006_badges.rb
+++ b/db/fixtures/006_badges.rb
@@ -66,7 +66,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Reader
   b.name = "Reader"
-  b.default_icon = "book-reader"
+  b.default_icon = "book-open-reader"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = false
@@ -80,7 +80,7 @@ end
 Badge.seed do |b|
   b.id = Badge::ReadGuidelines
   b.name = "Read Guidelines"
-  b.default_icon = "file-alt"
+  b.default_icon = "file-lines"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = false
@@ -223,7 +223,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Autobiographer
   b.name = "Autobiographer"
-  b.default_icon = "user-edit"
+  b.default_icon = "user-pen"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.query = BadgeQueries::Autobiographer
@@ -247,7 +247,7 @@ end
 Badge.seed do |b|
   b.id = Badge::WikiEditor
   b.name = "Wiki Editor"
-  b.default_icon = "far-edit"
+  b.default_icon = "far-pen-to-square"
   b.badge_type_id = BadgeType::Bronze
   b.multiple_grant = false
   b.target_posts = true
@@ -300,7 +300,7 @@ end
 Badge.seed do |b|
   b.id = Badge::Anniversary
   b.name = "Anniversary"
-  b.default_icon = "birthday-cake"
+  b.default_icon = "cake-candles"
   b.badge_type_id = BadgeType::Silver
   b.default_badge_grouping_id = BadgeGrouping::Community
   b.query = nil
diff --git a/lib/reviewable/actions.rb b/lib/reviewable/actions.rb
index a2a34b61f78..4df0eaee70f 100644
--- a/lib/reviewable/actions.rb
+++ b/lib/reviewable/actions.rb
@@ -17,7 +17,7 @@ class Reviewable < ActiveRecord::Base
       {
         approve: Action.new(:approve, "thumbs-up", "reviewables.actions.approve.title"),
         reject: Action.new(:reject, "thumbs-down", "reviewables.actions.reject.title"),
-        delete: Action.new(:delete, "trash-alt", "reviewables.actions.delete_single.title"),
+        delete: Action.new(:delete, "trash-can", "reviewables.actions.delete_single.title"),
       }
     end
 
diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjs
index 2d68cb2d8af..d35ebfee393 100644
--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjs
+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjs
@@ -23,7 +23,7 @@ export default class DateTimeField extends BaseField {
 
             {{#if @field.metadata.value}}
               <DButton
-                @icon="trash-alt"
+                @icon="trash-can"
                 @action={{this.reset}}
                 @disabled={{@field.isDisabled}}
               />
diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs
index 8aafd1ebe1b..299739a68ea 100644
--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs
+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs
@@ -115,7 +115,7 @@ export default class PmsField extends BaseField {
           </div>
           <section class="actions">
             <DButton
-              @icon="trash-alt"
+              @icon="trash-can"
               @action={{fn this.removePM pm}}
               class="btn-danger"
               @disabled={{@field.isDisabled}}
diff --git a/plugins/automation/admin/assets/javascripts/admin/helpers/format-enabled-automation.js b/plugins/automation/admin/assets/javascripts/admin/helpers/format-enabled-automation.js
index 0a3675350b7..e807195e560 100644
--- a/plugins/automation/admin/assets/javascripts/admin/helpers/format-enabled-automation.js
+++ b/plugins/automation/admin/assets/javascripts/admin/helpers/format-enabled-automation.js
@@ -11,7 +11,7 @@ export default function formatEnabledAutomation(enabled, trigger) {
     );
   } else {
     return htmlSafe(
-      iconHTML("times", {
+      iconHTML("xmark", {
         class: "disabled-automation",
         title: "discourse_automation.models.automation.disabled.label",
       })
diff --git a/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-index.hbs b/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-index.hbs
index 054259bb127..f2a03138297 100644
--- a/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-index.hbs
+++ b/plugins/automation/admin/assets/javascripts/admin/templates/admin-plugins-discourse-automation-index.hbs
@@ -66,7 +66,7 @@
 
           <td>
             <DButton
-              @icon="trash-alt"
+              @icon="trash-can"
               @action={{action "destroyAutomation" automation}}
               class="btn-danger"
             />
diff --git a/plugins/chat/app/models/chat/reviewable_message.rb b/plugins/chat/app/models/chat/reviewable_message.rb
index f10d23ba667..f1ce3beb26c 100644
--- a/plugins/chat/app/models/chat/reviewable_message.rb
+++ b/plugins/chat/app/models/chat/reviewable_message.rb
@@ -41,7 +41,7 @@ module Chat
     def build_actions(actions, guardian, args)
       return unless pending?
 
-      return build_action(actions, :ignore, icon: "external-link-alt") if chat_message.blank?
+      return build_action(actions, :ignore, icon: "up-right-from-square") if chat_message.blank?
 
       agree =
         actions.add_bundle(
@@ -79,10 +79,10 @@ module Chat
 
       ignore_bundle = actions.add_bundle("#{id}-ignore", label: "reviewables.actions.ignore.title")
 
-      build_action(actions, :ignore, icon: "external-link-alt", bundle: ignore_bundle)
+      build_action(actions, :ignore, icon: "up-right-from-square", bundle: ignore_bundle)
 
       unless chat_message.deleted_at?
-        build_action(actions, :delete_and_agree, icon: "far-trash-alt", bundle: ignore_bundle)
+        build_action(actions, :delete_and_agree, icon: "trash-can", bundle: ignore_bundle)
       end
     end
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjs b/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjs
index e4c8b221f99..34917638bed 100644
--- a/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjs
@@ -92,7 +92,7 @@ export default class BrowseChannels extends Component {
         <DcFilterInput
           {{didInsert this.focusFilterInput}}
           @filterAction={{this.setFilter}}
-          @icons={{hash right="search"}}
+          @icons={{hash right="magnifying-glass"}}
           @containerClass="filter-input"
           placeholder={{i18n "chat.browse.filter_input_placeholder"}}
         />
diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs b/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs
index 6485d17fec5..8e1e515adda 100644
--- a/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs
@@ -88,7 +88,7 @@ export default class ChannelsListPublic extends Component {
           class="btn no-text btn-flat open-browse-page-btn title-action"
           title={{i18n "chat.channels_list_popup.browse"}}
         >
-          {{dIcon "pencil-alt"}}
+          {{dIcon "pencil"}}
         </LinkTo>
       </div>
     {{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjs
index d4d91c730ea..09430a4b1d3 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjs
@@ -22,7 +22,7 @@ export default class ChatChannelLeaveBtn extends Component {
   <template>
     {{#if this.shouldRender}}
       <DButton
-        @icon="times"
+        @icon="xmark"
         @action={{@onLeaveChannel}}
         @title={{this.leaveChatTitleKey}}
         class="btn-flat chat-channel-leave-btn"
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
index 08ac0e753e0..6ca10af0d2d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
@@ -213,7 +213,7 @@ export default class ChatChannelRow extends Component {
             @options={{hash
               leaveClass="btn-flat chat-channel-leave-btn"
               labelType="none"
-              leaveIcon="times"
+              leaveIcon="xmark"
               leaveTitle=(if
                 @channel.isDirectMessageChannel
                 this.leaveDirectMessageLabel
@@ -231,7 +231,7 @@ export default class ChatChannelRow extends Component {
             (if this.isAtThreshold "-at-threshold" "-not-at-threshold")
           }}
         >
-          {{icon "times-circle"}}
+          {{icon "circle-xmark"}}
         </div>
       {{/if}}
     </LinkTo>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs
index 454502438e0..910ad7766b4 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs
@@ -11,7 +11,7 @@ const ChatComposerMessageDetails = <template>
     data-action={{if @message.editing "edit" "reply"}}
   >
     <div class="chat-reply">
-      {{dIcon (if @message.editing "pencil-alt" "reply")}}
+      {{dIcon (if @message.editing "pencil" "reply")}}
       <ChatUserAvatar @user={{@message.user}} />
       <span class="chat-reply__username">{{@message.user.username}}</span>
       <span class="chat-reply__excerpt">
@@ -21,7 +21,7 @@ const ChatComposerMessageDetails = <template>
 
     <DButton
       @action={{@cancelAction}}
-      @icon="times-circle"
+      @icon="circle-xmark"
       @title="cancel"
       class="btn-flat cancel-message-action"
     />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs
index 05be9c194cc..4c43e5b6fad 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs
@@ -35,7 +35,7 @@ export default class ChatComposerUpload extends Component {
               {{dIcon "far-image"}}
             {{/if}}
           {{else}}
-            {{dIcon "file-alt"}}
+            {{dIcon "file-lines"}}
           {{/if}}
         </div>
 
@@ -70,7 +70,7 @@ export default class ChatComposerUpload extends Component {
 
         <DButton
           @action={{@onCancel}}
-          @icon="times"
+          @icon="xmark"
           @title="chat.remove_upload"
           class="btn-flat chat-composer-upload__remove-btn"
         />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs
index 0353a804e31..0c85fef2300 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-picker.hbs
@@ -26,7 +26,7 @@
         }}
         @value={{this.chatEmojiPickerManager.picker.initialFilter}}
         @filterAction={{with-event-value this.didInputFilter}}
-        @icons={{hash left="search"}}
+        @icons={{hash left="magnifying-glass"}}
         @containerClass="chat-emoji-picker__filter"
         autofocus={{true}}
         placeholder={{i18n "chat.emoji_picker.search_placeholder"}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs
index d18c7956030..0b33cccadbe 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs
@@ -152,7 +152,7 @@ export default class ChatMentionWarnings extends Component {
     {{#if this.show}}
       <div class="chat-mention-warnings">
         <div class="chat-mention-warning__icon">
-          {{dIcon "exclamation-triangle"}}
+          {{dIcon "triangle-exclamation"}}
         </div>
         <div class="chat-mention-warning__text">
           <div class="chat-mention-warning__header">
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs
index 29eb4b64b1b..26c4e31a6fb 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs
@@ -184,7 +184,7 @@ export default class ChatMessageActionsDesktop extends Component {
           }}
             <DropdownSelectBox
               @options={{hash
-                icon="ellipsis-v"
+                icon="ellipsis-vertical"
                 placement="left"
                 customStyle="true"
                 btnCustomClasses="btn-flat"
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjs
index 58dbde81d95..55d8022ddd3 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjs
@@ -36,7 +36,7 @@ export default class ChatNotices extends Component {
       {{/if}}
 
       <DButton
-        @icon="times"
+        @icon="xmark"
         @action={{this.clearNotice}}
         class="btn-transparent chat-notices__notice__clear"
       />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjs
index a590c3bb56a..3b1cc535c2f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjs
@@ -40,7 +40,7 @@ export default class ChatRetentionReminder extends Component {
         <ChatRetentionReminderText @channel={{@channel}} />
         <DButton
           @action={{this.dismiss}}
-          @icon="times"
+          @icon="xmark"
           class="no-text btn-icon btn-transparent dismiss-btn"
         />
       </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs
index 4282e45801c..edf20a8fd81 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs
@@ -55,7 +55,7 @@ export default class ChatHeaderIcon extends Component {
       !this.chatSeparateSidebarMode.never &&
       this.site.desktopView
     ) {
-      return "random";
+      return "shuffle";
     }
 
     return "d-chat";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs
index 96bf14a8a7e..c04d3066a4e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs
@@ -29,7 +29,7 @@ export default class ChatableGroup extends Component {
       data-disabled={{this.isDisabled}}
     >
       <div class="chat-message-creator__group-icon">
-        {{icon "user-friends"}}
+        {{icon "user-group"}}
       </div>
       <div class="chat-message-creator__group-name">
         {{@item.model.name}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs
index 63fea26e4f9..c42b32e2cd3 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs
@@ -24,14 +24,14 @@ const Member = <template>
       </span>
     {{else if (eq @member.type "group")}}
       <div class="chat-message-creator__group-icon">
-        {{icon "user-friends"}}
+        {{icon "user-group"}}
       </div>
       <span class="chat-message-creator__member-group">
         {{@member.model.name}}
       </span>
     {{/if}}
 
-    {{icon "times"}}
+    {{icon "xmark"}}
   </DButton>
 </template>;
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs
index 18dee87185a..c9d0e972a08 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs
@@ -130,7 +130,7 @@ export default class MembersSelector extends Component {
           <DButton
             class="btn-flat chat-message-creator__add-members__close-btn"
             @action={{@cancel}}
-            @icon="times"
+            @icon="xmark"
           />
         </div>
       </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs
index 720ae2ddb18..fd6e586489a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs
@@ -75,7 +75,7 @@ export default class Members extends Component {
   <template>
     <div class="chat-message-creator__members-container">
       <div class="chat-message-creator__members">
-        {{icon "search"}}
+        {{icon "magnifying-glass"}}
 
         {{#each @members as |member|}}
           <Member
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs
index bce963d7f03..b269e75c8ed 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs
@@ -11,7 +11,7 @@ export default class ChatMessageCreatorSearchInput extends Component {
     <div class="chat-message-creator__search-input-container">
       <div class="chat-message-creator__search-input">
         {{icon
-          "search"
+          "magnifying-glass"
           class="chat-message-creator__search-input__search-icon"
         }}
         <Input
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs
index 886631aa1f6..9b96d7d61e0 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs
@@ -155,7 +155,7 @@ export default class ChatMessageCreatorSearch extends Component {
 
             <DButton
               class="btn-flat chat-message-creator__search-input__cancel-button"
-              @icon="times"
+              @icon="xmark"
               @action={{@close}}
             />
           </div>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjs
index fc6d8953a95..917a99d71cd 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjs
@@ -10,7 +10,7 @@ const Error = <template>
         <DButton
           class="chat-message-error__retry-btn"
           @action={{fn @onRetry @message}}
-          @icon="exclamation-circle"
+          @icon="circle-exclamation"
         >
           <span class="chat-message-error__retry-btn-title">
             {{i18n "chat.retry_staged_message.title"}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
index 08c722950ba..1089903edc8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.hbs
@@ -25,7 +25,7 @@
       <label for="slug" class="chat-modal-create-channel__label">
         {{i18n "chat.create_channel.slug"}}&nbsp;
         <span>
-          {{d-icon "info-circle"}}
+          {{d-icon "circle-info"}}
           <DTooltip>
             {{i18n "chat.channel_edit_name_slug_modal.slug_description"}}
           </DTooltip>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjs
index 285091bb32a..262033850c2 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjs
@@ -37,7 +37,7 @@ export default class DeleteMessagesConfirm extends Component {
           class="btn-primary"
           @action={{this.delete}}
           @label="delete"
-          @icon="trash-alt"
+          @icon="trash-can"
         />
         <DModalCancel @close={{@closeModal}} />
       </:footer>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjs
index da6f1b88fbc..cfdf78efb0f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjs
@@ -130,7 +130,7 @@ export default class ChatModalEditChannelName extends Component {
           <label for="channel-slug" class="edit-channel-label">
             {{i18n "chat.channel_edit_name_slug_modal.slug"}}&nbsp;
             <DTooltip
-              @icon="info-circle"
+              @icon="circle-info"
               @content={{i18n
                 "chat.channel_edit_name_slug_modal.slug_description"
               }}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjs
index 222250b0ca5..a5ca6e5e914 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjs
@@ -91,7 +91,7 @@ export default class ChatModalMoveMessageToChannel extends Component {
       </:body>
       <:footer>
         <DButton
-          @icon="sign-out-alt"
+          @icon="right-from-bracket"
           @disabled={{this.disableMoveButton}}
           @action={{this.moveMessages}}
           @label="chat.move_to_channel.confirm_move"
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs
index 6b4b27c374f..98ba05fa922 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs
@@ -77,7 +77,7 @@ export default class ChatModalThreadSettings extends Component {
 
         {{#if this.currentUser.admin}}
           <div class="discourse-ai-cta">
-            <p class="discourse-ai-cta__title">{{icon "info-circle"}}
+            <p class="discourse-ai-cta__title">{{icon "circle-info"}}
               {{i18n "chat.thread_title_modal.discourse_ai.title"}}</p>
             <p class="discourse-ai-cta__description">{{htmlSafe
                 (i18n
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs
index d2f4022dc57..2984559b2ff 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs
@@ -20,7 +20,7 @@ export default class ChatNavbarBrowseChannelsButton extends Component {
         class="btn no-text btn-flat c-navbar__browse-button"
         title={{this.browseChannelsLabel}}
       >
-        {{icon "pencil-alt"}}
+        {{icon "pencil"}}
       </LinkTo>
     {{/if}}
   </template>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjs
index 62e94d74c38..7415c36172e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjs
@@ -15,7 +15,7 @@ export default class ChatNavbarCloseDrawerButton extends Component {
 
   <template>
     <DButton
-      @icon="times"
+      @icon="xmark"
       @action={{this.closeDrawer}}
       @title="chat.close"
       class="btn-transparent no-text c-navbar__close-drawer-button"
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs
index 4d67aeed45b..379bca85fc8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs
@@ -15,7 +15,7 @@ export default class ChatNavbarCloseThreadButton extends Component {
         @models={{@thread.channel.routeModels}}
         title={{i18n "chat.thread.close"}}
       >
-        {{icon "times"}}
+        {{icon "xmark"}}
       </LinkTo>
     {{/if}}
   </template>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs
index 1ed05792fc5..80609fc83fb 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs
@@ -17,7 +17,7 @@ export default class ChatNavbarCloseThreadsButton extends Component {
         @models={{@channel.routeModels}}
         title={{this.closeButtonTitle}}
       >
-        {{icon "times"}}
+        {{icon "xmark"}}
       </LinkTo>
     {{/if}}
   </template>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjs
index f4983172c4a..6b34adc1ef5 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjs
@@ -28,7 +28,7 @@ export default class ChatNavbarThreadSettingsButton extends Component {
     {{#if this.canChangeThreadSettings}}
       <DButton
         @action={{this.openThreadSettings}}
-        @icon="cog"
+        @icon="gear"
         @title="chat.thread.settings"
         class="btn-transparent c-navbar__thread-settings-button"
       />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjs
index 717058b4974..a5ffea4507e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjs
@@ -10,8 +10,8 @@ export default class ChatNavbarToggleDrawerButton extends Component {
     <DButton
       @icon={{if
         this.chatStateManager.isDrawerExpanded
-        "angle-double-down"
-        "angle-double-up"
+        "angles-down"
+        "angles-up"
       }}
       @action={{this.chat.toggleDrawer}}
       @title={{if
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs
index 648d6349fb7..e3405234047 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs
@@ -148,7 +148,7 @@ export default class ChatRouteChannelInfoMembers extends Component {
           <DcFilterInput
             {{autoFocus}}
             @filterAction={{this.mutFilter}}
-            @icons={{hash right="search"}}
+            @icons={{hash right="magnifying-glass"}}
             @containerClass="c-channel-members__filter"
             placeholder={{this.filterPlaceholder}}
           />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
index 53350e5bf98..c7fc147fb5b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
@@ -538,7 +538,7 @@ export default class ChatRouteChannelInfoSettings extends Component {
                       <DButton
                         @action={{this.onArchiveChannel}}
                         @label="chat.channel_settings.archive_channel"
-                        @icon="archive"
+                        @icon="box-archive"
                         class="archive-btn chat-form__btn btn-transparent"
                       />
                     </:action>
@@ -570,7 +570,7 @@ export default class ChatRouteChannelInfoSettings extends Component {
                     <DButton
                       @action={{this.onDeleteChannel}}
                       @label="chat.channel_settings.delete_channel"
-                      @icon="trash-alt"
+                      @icon="trash-can"
                       class="delete-btn chat-form__btn btn-transparent"
                     />
                   </:action>
@@ -583,7 +583,7 @@ export default class ChatRouteChannelInfoSettings extends Component {
           <form.section class="--leave-channel" as |section|>
             {{#if @channel.chatable.group}}
               <div class="c-channel-settings__leave-info">
-                {{icon "exclamation-triangle"}}
+                {{icon "triangle-exclamation"}}
                 {{i18n "chat.channel_settings.leave_groupchat_info"}}
               </div>
             {{/if}}
@@ -595,8 +595,8 @@ export default class ChatRouteChannelInfoSettings extends Component {
                   @options={{hash
                     joinClass="btn-primary"
                     leaveClass="btn-danger"
-                    joinIcon="sign-in-alt"
-                    leaveIcon="sign-out-alt"
+                    joinIcon="right-to-bracket"
+                    leaveIcon="right-from-bracket"
                   }}
                 />
               </:action>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs
index fbe34c581a8..4d04ff1b410 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs
@@ -180,7 +180,7 @@ export default class ChatSelectionManager extends Component {
 
         {{#if this.enableMove}}
           <DButton
-            @icon="sign-out-alt"
+            @icon="right-from-bracket"
             @label="chat.selection.move_selection_to_channel"
             @disabled={{not this.anyMessagesSelected}}
             @action={{this.openMoveMessageModal}}
@@ -189,7 +189,7 @@ export default class ChatSelectionManager extends Component {
         {{/if}}
 
         <DButton
-          @icon="trash-alt"
+          @icon="trash-can"
           @translatedLabel={{this.deleteButtonTitle}}
           @disabled={{or
             (not this.anyMessagesSelected)
@@ -201,7 +201,7 @@ export default class ChatSelectionManager extends Component {
         />
 
         <DButton
-          @icon="times"
+          @icon="xmark"
           @label="chat.selection.cancel"
           @action={{@pane.cancelSelecting}}
           id="chat-cancel-selection-btn"
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
index b6372b88db9..149954d299d 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
@@ -75,7 +75,7 @@ class ChatSetupInit {
           label: "discourse_local_dates.title",
           id: "local-dates",
           class: "chat-local-dates-btn",
-          icon: "calendar-alt",
+          icon: "calendar-days",
           position: "dropdown",
           action() {
             this.insertDiscourseLocalDate();
@@ -87,7 +87,7 @@ class ChatSetupInit {
         label: "chat.emoji",
         id: "emoji",
         class: "chat-emoji-btn",
-        icon: "far-smile",
+        icon: "far-face-smile",
         position: this.site.desktopView ? "inline" : "dropdown",
         context: "channel",
         action() {
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
index 7de1e561528..faaf2ca0a04 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
@@ -258,7 +258,7 @@ export default {
               }
 
               get actionsIcon() {
-                return "pencil-alt";
+                return "pencil";
               }
 
               get links() {
@@ -287,7 +287,7 @@ export default {
             suffixType = "icon";
             suffixCSSClass = "urgent";
             hoverType = "icon";
-            hoverValue = "times";
+            hoverValue = "xmark";
             hoverTitle = I18n.t("chat.direct_messages.close");
 
             constructor({ channel, chatService, currentUser }) {
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
index 2990c6f289c..e01f06e1fd8 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
@@ -178,7 +178,7 @@ export default class ChatMessageInteractor {
       buttons.push({
         id: "edit",
         name: I18n.t("chat.edit"),
-        icon: "pencil-alt",
+        icon: "pencil",
       });
     }
 
@@ -186,7 +186,7 @@ export default class ChatMessageInteractor {
       buttons.push({
         id: "select",
         name: I18n.t("chat.select"),
-        icon: "tasks",
+        icon: "list-check",
       });
     }
 
@@ -202,7 +202,7 @@ export default class ChatMessageInteractor {
       buttons.push({
         id: "delete",
         name: I18n.t("chat.delete"),
-        icon: "trash-alt",
+        icon: "trash-can",
       });
     }
 
@@ -210,7 +210,7 @@ export default class ChatMessageInteractor {
       buttons.push({
         id: "restore",
         name: I18n.t("chat.restore"),
-        icon: "undo",
+        icon: "arrow-rotate-left",
       });
     }
 
@@ -218,7 +218,7 @@ export default class ChatMessageInteractor {
       buttons.push({
         id: "rebake",
         name: I18n.t("chat.rebake_message"),
-        icon: "sync-alt",
+        icon: "rotate",
       });
     }
 
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-creator.scss b/plugins/chat/assets/stylesheets/common/chat-message-creator.scss
index 478bb05231c..4dc7f9e3a81 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-creator.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-creator.scss
@@ -25,7 +25,7 @@
       height: 24px;
       width: 24px;
 
-      .d-icon.d-icon-user-friends {
+      .d-icon.d-icon-user-group {
         color: var(--primary-high);
       }
     }
@@ -33,7 +33,7 @@
     .-group & {
       width: 26px;
       height: 26px;
-      .d-icon-user-friends {
+      .d-icon-user-group {
         padding: 5px 5px;
         box-sizing: border-box;
         color: var(--primary-high);
@@ -60,13 +60,13 @@
         color: var(--primary);
         border-color: var(--tertiary);
 
-        .d-icon-times {
+        .d-icon-xmark {
           color: var(--primary);
         }
       }
     }
 
-    .d-icon-times {
+    .d-icon-xmark {
       margin-left: 0.25rem;
     }
   }
@@ -143,7 +143,7 @@
     min-height: 50px;
     box-sizing: border-box;
 
-    .d-icon-search {
+    .d-icon-magnifying-glass {
       color: var(--primary-high);
     }
 
diff --git a/plugins/chat/spec/system/page_objects/chat/components/header.rb b/plugins/chat/spec/system/page_objects/chat/components/header.rb
index b9c78052946..aaab85326d5 100644
--- a/plugins/chat/spec/system/page_objects/chat/components/header.rb
+++ b/plugins/chat/spec/system/page_objects/chat/components/header.rb
@@ -9,7 +9,7 @@ module PageObjects
         end
 
         def has_open_forum_button?
-          has_css?(".d-header .chat-header-icon .d-icon-random")
+          has_css?(".d-header .chat-header-icon .d-icon-shuffle")
         end
 
         def has_no_chat_button?
diff --git a/plugins/chat/test/javascripts/components/chat-composer-dropdown-test.js b/plugins/chat/test/javascripts/components/chat-composer-dropdown-test.js
index 76b0a1604f3..b0dcd65441c 100644
--- a/plugins/chat/test/javascripts/components/chat-composer-dropdown-test.js
+++ b/plugins/chat/test/javascripts/components/chat-composer-dropdown-test.js
@@ -8,14 +8,14 @@ module("Discourse Chat | Component | chat-composer-dropdown", function (hooks) {
   setupRenderingTest(hooks);
 
   test("buttons", async function (assert) {
-    this.set("buttons", [{ id: "foo", icon: "times", action: () => {} }]);
+    this.set("buttons", [{ id: "foo", icon: "xmark", action: () => {} }]);
 
     await render(hbs`<ChatComposerDropdown @buttons={{this.buttons}} />`);
     await click(".chat-composer-dropdown__trigger-btn");
 
     assert.true(exists(".chat-composer-dropdown__item.foo"));
     assert.true(
-      exists(".chat-composer-dropdown__action-btn.foo .d-icon-times")
+      exists(".chat-composer-dropdown__action-btn.foo .d-icon-xmark")
     );
   });
 });
diff --git a/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js b/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js
index a537450d5fb..aee61441933 100644
--- a/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js
+++ b/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js
@@ -31,7 +31,7 @@ module(
         hbs`<ChatComposerMessageDetails @message={{this.message}} />`
       );
 
-      assert.dom(".chat-composer-message-details .d-icon-pencil-alt").exists();
+      assert.dom(".chat-composer-message-details .d-icon-pencil").exists();
     });
 
     test("replying to a message has the reply icon", async function (assert) {
diff --git a/plugins/chat/test/javascripts/components/chat-composer-upload-test.js b/plugins/chat/test/javascripts/components/chat-composer-upload-test.js
index 6b5a8c76e28..bbb0e50f019 100644
--- a/plugins/chat/test/javascripts/components/chat-composer-upload-test.js
+++ b/plugins/chat/test/javascripts/components/chat-composer-upload-test.js
@@ -68,7 +68,7 @@ module("Discourse Chat | Component | chat-composer-upload", function (hooks) {
       hbs`<ChatComposerUpload @isDone={{true}} @upload={{this.upload}} />`
     );
 
-    assert.true(exists(".d-icon-file-alt"));
+    assert.true(exists(".d-icon-file-lines"));
     assert.strictEqual(query(".file-name").innerText.trim(), "some file.pdf");
     assert.strictEqual(query(".extension-pill").innerText.trim(), "pdf");
   });
diff --git a/plugins/chat/test/javascripts/components/chat-header-icon-test.js b/plugins/chat/test/javascripts/components/chat-header-icon-test.js
index 7e30b90c34d..f47eefb37f0 100644
--- a/plugins/chat/test/javascripts/components/chat-header-icon-test.js
+++ b/plugins/chat/test/javascripts/components/chat-header-icon-test.js
@@ -40,7 +40,7 @@ module("Discourse Chat | Component | chat-header-icon", function (hooks) {
       .hasAttribute("title", I18n.t("sidebar.panels.forum.label"))
       .hasAttribute("href", "/latest");
 
-    assert.dom(".d-icon-random").exists();
+    assert.dom(".d-icon-shuffle").exists();
   });
 
   test("mobile", async function (assert) {
@@ -71,7 +71,7 @@ module("Discourse Chat | Component | chat-header-icon", function (hooks) {
       .dom(".icon.btn-flat")
       .hasAttribute("title", I18n.t("sidebar.panels.forum.label"))
       .hasAttribute("href", "/latest");
-    assert.dom(".d-icon-random").exists();
+    assert.dom(".d-icon-shuffle").exists();
     assert.dom(".chat-channel-unread-indicator__number").doesNotExist();
   });
 
diff --git a/plugins/chat/test/javascripts/unit/lib/chat-composer-buttons-test.js b/plugins/chat/test/javascripts/unit/lib/chat-composer-buttons-test.js
index eabb9300e6d..bf62526c383 100644
--- a/plugins/chat/test/javascripts/unit/lib/chat-composer-buttons-test.js
+++ b/plugins/chat/test/javascripts/unit/lib/chat-composer-buttons-test.js
@@ -10,7 +10,7 @@ module("Discourse Chat | Unit | chat-composer-buttons", function (hooks) {
   hooks.beforeEach(function () {
     registerChatComposerButton({
       id: "foo",
-      icon: "times",
+      icon: "xmark",
       dependentKeys: ["test"],
     });
 
diff --git a/plugins/checklist/assets/javascripts/lib/discourse-markdown/checklist.js b/plugins/checklist/assets/javascripts/lib/discourse-markdown/checklist.js
index 1e4407ffe47..2488ec72fc6 100644
--- a/plugins/checklist/assets/javascripts/lib/discourse-markdown/checklist.js
+++ b/plugins/checklist/assets/javascripts/lib/discourse-markdown/checklist.js
@@ -3,9 +3,9 @@ const REGEX = /\[( |x)?\]/gi;
 function getClasses(str) {
   switch (str) {
     case "x":
-      return "checked fa fa-check-square-o fa-fw";
+      return "checked fa fa-square-check-o fa-fw";
     case "X":
-      return "checked permanent fa fa-check-square fa-fw";
+      return "checked permanent fa fa-square-check fa-fw";
     default:
       return "fa fa-square-o fa-fw";
   }
@@ -94,8 +94,8 @@ export function setup(helper) {
   helper.allowList([
     "span.chcklst-stroked",
     "span.chcklst-box fa fa-square-o fa-fw",
-    "span.chcklst-box checked fa fa-check-square-o fa-fw",
-    "span.chcklst-box checked permanent fa fa-check-square fa-fw",
+    "span.chcklst-box checked fa fa-square-check-o fa-fw",
+    "span.chcklst-box checked permanent fa fa-square-check fa-fw",
   ]);
 
   helper.registerPlugin((md) =>
diff --git a/plugins/checklist/assets/stylesheets/checklist.scss b/plugins/checklist/assets/stylesheets/checklist.scss
index 4df20e2c6ce..b4b9752d87e 100644
--- a/plugins/checklist/assets/stylesheets/checklist.scss
+++ b/plugins/checklist/assets/stylesheets/checklist.scss
@@ -44,7 +44,7 @@ span.chcklst-box {
       "M400 480H48c-26.51 0-48-21.49-48-48V80c0-26.51 21.49-48 48-48h352c26.51 0 48 21.49 48 48v352c0 26.51-21.49 48-48 48zm-204.686-98.059l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.248-16.379-6.249-22.628 0L184 302.745l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.25 16.379 6.25 22.628.001z"
     );
 
-    &.fa-check-square-o {
+    &.fa-square-check-o {
       @include checklist-svg-icon(
         "M400 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zm0 400H48V80h352v352zm-35.864-241.724L191.547 361.48c-4.705 4.667-12.303 4.637-16.97-.068l-90.781-91.516c-4.667-4.705-4.637-12.303.069-16.971l22.719-22.536c4.705-4.667 12.303-4.637 16.97.069l59.792 60.277 141.352-140.216c4.705-4.667 12.303-4.637 16.97.068l22.536 22.718c4.667 4.706 4.637 12.304-.068 16.971z"
       );
diff --git a/plugins/checklist/spec/pretty_text_spec.rb b/plugins/checklist/spec/pretty_text_spec.rb
index e37dc533d62..4f041cba227 100644
--- a/plugins/checklist/spec/pretty_text_spec.rb
+++ b/plugins/checklist/spec/pretty_text_spec.rb
@@ -9,7 +9,7 @@ describe PrettyText do
       MD
 
       html = <<~HTML
-      <p><span class="chcklst-box fa fa-square-o fa-fw"></span>,<span class="chcklst-box fa fa-square-o fa-fw"></span>,<span class="chcklst-box checked fa fa-check-square-o fa-fw"></span>,<span class="chcklst-box checked permanent fa fa-check-square fa-fw"></span> are all checkboxes<br>
+      <p><span class="chcklst-box fa fa-square-o fa-fw"></span>,<span class="chcklst-box fa fa-square-o fa-fw"></span>,<span class="chcklst-box checked fa fa-square-check-o fa-fw"></span>,<span class="chcklst-box checked permanent fa fa-square-check fa-fw"></span> are all checkboxes<br>
       <code>[ ]</code> <a>x</a> <em>[ ]</em> <strong>[ ]</strong> <em>[ ]</em> <strong>[ ]</strong> <s>[ ]</s> are not checkboxes</p>
       HTML
       cooked = PrettyText.cook(md)
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs
index 5f38f633ce1..edaed7c018f 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs
@@ -27,7 +27,7 @@
               {{if this.fromSelected 'is-selected'}}
               {{if this.fromFilled 'is-filled'}}"
           >
-            {{d-icon "calendar-alt"}}
+            {{d-icon "calendar-days"}}
             <DButton
               @action={{this.focusFrom}}
               @translatedLabel={{this.formattedFrom}}
@@ -42,7 +42,7 @@
               {{if this.toSelected 'is-selected'}}
               {{if this.toFilled 'is-filled'}}"
           >
-            {{d-icon "calendar-alt"}}
+            {{d-icon "calendar-days"}}
             <DButton
               @action={{this.focusTo}}
               @translatedLabel={{this.formattedTo}}
@@ -51,7 +51,7 @@
             {{#if this.toFilled}}
               <DButton
                 @action={{this.eraseToDateTime}}
-                @icon="times"
+                @icon="xmark"
                 class="delete-to-date"
               />
             {{/if}}
@@ -144,7 +144,7 @@
                 href="https://momentjs.com/docs/#/parsing/string-format/"
                 rel="noopener noreferrer"
               >
-                {{d-icon "question-circle"}}
+                {{d-icon "circle-question"}}
               </a>
             </p>
             <div class="controls">
@@ -192,7 +192,7 @@
 
     <DButton
       @action={{this.toggleAdvancedMode}}
-      @icon="cog"
+      @icon="gear"
       @label={{this.toggleModeBtnLabel}}
       class="btn-default advanced-mode-btn"
     />
diff --git a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
index ad93eab3a20..ffed648b795 100644
--- a/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
+++ b/plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
@@ -163,7 +163,7 @@ function initializeDiscourseLocalDates(api) {
       title: "discourse_local_dates.title",
       id: "local-dates",
       group: "extras",
-      icon: "calendar-alt",
+      icon: "calendar-days",
       sendAction: (event) =>
         toolbar.context.send("insertDiscourseLocalDate", event),
     });
diff --git a/plugins/footnote/assets/javascripts/initializers/inline-footnotes.js b/plugins/footnote/assets/javascripts/initializers/inline-footnotes.js
index 004a0a492b8..2f6031a5819 100644
--- a/plugins/footnote/assets/javascripts/initializers/inline-footnotes.js
+++ b/plugins/footnote/assets/javascripts/initializers/inline-footnotes.js
@@ -15,7 +15,7 @@ function applyInlineFootnotes(elem) {
 
     const expandableFootnote = document.createElement("a");
     expandableFootnote.classList.add("expand-footnote");
-    expandableFootnote.innerHTML = iconHTML("ellipsis-h");
+    expandableFootnote.innerHTML = iconHTML("ellipsis");
     expandableFootnote.href = "";
     expandableFootnote.role = "button";
     expandableFootnote.dataset.footnoteId = refLink.getAttribute("href");
diff --git a/plugins/footnote/plugin.rb b/plugins/footnote/plugin.rb
index fb536569df1..01200d585b7 100644
--- a/plugins/footnote/plugin.rb
+++ b/plugins/footnote/plugin.rb
@@ -13,7 +13,7 @@ register_asset "vendor/javascripts/markdown-it-footnote.js", :vendored_pretty_te
 
 register_asset "stylesheets/footnotes.scss"
 
-register_svg_icon "ellipsis-h" if respond_to?(:register_svg_icon)
+register_svg_icon "ellipsis" if respond_to?(:register_svg_icon)
 
 on(:before_post_process_cooked) do |doc, post|
   doc
diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
index 038cad9e745..a959c453a17 100644
--- a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
@@ -92,7 +92,7 @@
               />
               {{#if this.canRemoveOption}}
                 <DButton
-                  @icon="trash-alt"
+                  @icon="trash-can"
                   @action={{fn this.removeOption option}}
                 />
               {{/if}}
@@ -257,7 +257,7 @@
 
     <DButton
       @action={{this.toggleAdvanced}}
-      @icon="cog"
+      @icon="gear"
       @title={{if
         this.showAdvanced
         "poll.ui_builder.hide_advanced"
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs
index 457c4209a7e..addbd450f75 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs
@@ -25,7 +25,7 @@ const buttonOptionsMap = {
     className: "btn-default toggle-status",
     label: "poll.open.label",
     title: "poll.open.title",
-    icon: "unlock-alt",
+    icon: "unlock-keyhole",
     action: "toggleStatus",
   },
   closePoll: {
@@ -133,7 +133,7 @@ export default class PollButtonsDropdownComponent extends Component {
       {{#if this.showDropdown}}
         <DMenu class="widget-dropdown-header">
           <:trigger>
-            {{icon "cog"}}
+            {{icon "gear"}}
           </:trigger>
           <:content>
             <DropdownMenu as |dropdown|>
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs
index 047c3d66823..2b1c7e8a828 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs
@@ -204,7 +204,7 @@ export default class PollInfoComponent extends Component {
           {{/if}}
           {{#if this.resultsStaffOnly}}
             <li class="results-staff-only">
-              {{icon "shield-alt"}}
+              {{icon "shield-halved"}}
               <span>{{this.resultsStaffOnlyTitle}}</span>
             </li>
           {{/if}}
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs
index 8ee78971fcd..e14e6bc4093 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs
@@ -76,7 +76,7 @@ export default class PollOptionsComponent extends Component {
               <button {{on "click" (fn this.sendClick option)}}>
                 {{#if (this.isChosen option)}}
                   {{#if @isCheckbox}}
-                    {{icon "far-check-square"}}
+                    {{icon "far-square-check"}}
                   {{else}}
                     {{icon "circle"}}
                   {{/if}}
@@ -93,7 +93,7 @@ export default class PollOptionsComponent extends Component {
               <button onclick={{routeAction "showLogin"}}>
                 {{#if (this.isChosen option)}}
                   {{#if @isCheckbox}}
-                    {{icon "far-check-square"}}
+                    {{icon "far-square-check"}}
                   {{else}}
                     {{icon "circle"}}
                   {{/if}}
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll.gjs b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
index a9e714e5a52..a5134f3f6cc 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
@@ -773,7 +773,7 @@ export default class PollComponent extends Component {
             title={{i18n "poll.remove-vote.title"}}
             {{on "click" this.removeVote}}
           >
-            {{icon "undo"}}
+            {{icon "arrow-rotate-left"}}
             <span class="d-button-label">{{i18n
                 "poll.remove-vote.label"
               }}</span>
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 554d8fc1675..25ba9c3c2f3 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -11,7 +11,7 @@ register_asset "stylesheets/common/poll-ui-builder.scss"
 register_asset "stylesheets/desktop/poll-ui-builder.scss", :desktop
 register_asset "stylesheets/common/poll-breakdown.scss"
 
-register_svg_icon "far fa-check-square"
+register_svg_icon "far fa-square-check"
 
 enabled_site_setting :poll_enabled
 hide_plugin
diff --git a/plugins/poll/test/javascripts/component/poll-options-test.js b/plugins/poll/test/javascripts/component/poll-options-test.js
index 1a9d2f055fb..71dbd39e1d1 100644
--- a/plugins/poll/test/javascripts/component/poll-options-test.js
+++ b/plugins/poll/test/javascripts/component/poll-options-test.js
@@ -110,7 +110,7 @@ module("Poll | Component | poll-options", function (hooks) {
       @sendRadioClick={{this.toggleOption}}
     />`);
 
-    assert.strictEqual(count("li .d-icon-far-check-square:nth-of-type(1)"), 1);
+    assert.strictEqual(count("li .d-icon-far-square-check:nth-of-type(1)"), 1);
   });
 
   test("single with images", async function (assert) {
diff --git a/plugins/spoiler-alert/assets/javascripts/initializers/spoiler-alert.js b/plugins/spoiler-alert/assets/javascripts/initializers/spoiler-alert.js
index fc4f85d78f5..c77c37e8dc8 100644
--- a/plugins/spoiler-alert/assets/javascripts/initializers/spoiler-alert.js
+++ b/plugins/spoiler-alert/assets/javascripts/initializers/spoiler-alert.js
@@ -17,7 +17,7 @@ export function initializeSpoiler(api) {
   api.decorateCookedElement(spoil, { id: "spoiler-alert" });
 
   api.addComposerToolbarPopupMenuOption({
-    icon: "magic",
+    icon: "wand-magic",
     label: "spoiler.title",
     action: (toolbarEvent) => {
       toolbarEvent.applySurround("[spoiler]", "[/spoiler]", "spoiler_text", {
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
index 5f44472c601..a0793e65ead 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.hbs
@@ -1,7 +1,7 @@
 <StyleguideExample @title=".btn-icon - sizes (large, default, small)">
   {{#each @dummy.buttonSizes as |bs|}}
     <DButton
-      @icon="times"
+      @icon="xmark"
       @translatedTitle={{bs.text}}
       @disabled={{bs.disabled}}
       class={{bs.class}}
@@ -12,7 +12,7 @@
 <StyleguideExample @title=".btn-icon - states">
   {{#each @dummy.buttonStates as |bs|}}
     <DButton
-      @icon="times"
+      @icon="xmark"
       @translatedTitle={{bs.text}}
       @disabled={{bs.disabled}}
       class={{bs.class}}
@@ -93,7 +93,7 @@
 >
   {{#each @dummy.buttonSizes as |bs|}}
     <DButton
-      @icon="trash-alt"
+      @icon="trash-can"
       @translatedLabel={{bs.text}}
       @disabled={{bs.disabled}}
       class={{concat-class "btn-danger" bs.class}}
@@ -104,7 +104,7 @@
 <StyleguideExample @title=".btn-danger .btn-icon-text - states">
   {{#each @dummy.buttonStates as |bs|}}
     <DButton
-      @icon="trash-alt"
+      @icon="trash-can"
       @translatedLabel={{bs.text}}
       @disabled={{bs.disabled}}
       class={{concat-class "btn-danger" bs.class}}
@@ -115,7 +115,7 @@
 <StyleguideExample @title=".btn-flat - sizes (large, default, small)">
   {{#each @dummy.buttonSizes as |bs|}}
     <FlatButton
-      @icon="trash-alt"
+      @icon="trash-can"
       @disabled={{bs.disabled}}
       @translatedTitle={{bs.title}}
     />
@@ -125,7 +125,7 @@
 <StyleguideExample @title=".btn-flat - states">
   {{#each @dummy.buttonStates as |bs|}}
     <FlatButton
-      @icon="trash-alt"
+      @icon="trash-can"
       @disabled={{bs.disabled}}
       @translatedTitle={{bs.title}}
     />
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs
index 6c8be19f9e8..82d7f2cb8d3 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/05-forms.hbs
@@ -157,7 +157,7 @@
 
 <StyleguideExample @title="Alert">
   <Form as |form|>
-    <form.Alert @icon="pencil-alt">
+    <form.Alert @icon="pencil">
       You can edit this form.
     </form.Alert>
   </Form>
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
index 9ef837fe9b5..571e5a33b80 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/user-about.hbs
@@ -22,7 +22,7 @@
               </li>
               <li>
                 <a href="#" class="btn">
-                  {{d-icon "angle-double-down"}}
+                  {{d-icon "angles-down"}}
                   {{i18n "user.expand_profile"}}
                 </a>
               </li>
@@ -32,7 +32,7 @@
           <div class="primary-textual">
             <h1 class="username">
               {{@dummy.user.username}}
-              {{d-icon "shield-alt"}}
+              {{d-icon "shield-halved"}}
             </h1>
             <h2 class="full-name">{{@dummy.user.name}}</h2>
             <h3>{{@dummy.user.title}}</h3>
@@ -70,7 +70,7 @@
               </li>
               <li>
                 <a href="#" class="btn">
-                  {{d-icon "angle-double-down"}}
+                  {{d-icon "angles-down"}}
                   {{i18n "user.expand_profile"}}
                 </a>
               </li>
@@ -80,7 +80,7 @@
           <div class="primary-textual">
             <h1 class="username">
               {{@dummy.user.username}}
-              {{d-icon "shield-alt"}}
+              {{d-icon "shield-halved"}}
             </h1>
             <h2 class="full-name">{{@dummy.user.name}}</h2>
             <h3>{{@dummy.user.title}}</h3>
@@ -152,12 +152,12 @@
           <div class="primary-textual">
             <h1 class="username">
               {{@dummy.user.username}}
-              {{d-icon "shield-alt"}}
+              {{d-icon "shield-halved"}}
             </h1>
             <h2 class="full-name">{{@dummy.user.name}}</h2>
             <h3>{{@dummy.user.title}}</h3>
             <h3>
-              {{d-icon "map-marker-alt"}}
+              {{d-icon "location-dot"}}
               {{@dummy.user.location}}
               {{d-icon "globe"}}
               <a
@@ -237,7 +237,7 @@
             {{/each}}
           </dd>
           <DButton
-            @icon="exclamation-triangle"
+            @icon="triangle-exclamation"
             @label="user.admin_delete"
             class="btn-danger"
           />
@@ -309,12 +309,12 @@
           <div class="primary-textual">
             <h1 class="username">
               {{@dummy.user.username}}
-              {{d-icon "shield-alt"}}
+              {{d-icon "shield-halved"}}
             </h1>
             <h2 class="full-name">{{@dummy.user.name}}</h2>
             <h3>{{@dummy.user.title}}</h3>
             <h3>
-              {{d-icon "map-marker-alt"}}
+              {{d-icon "location-dot"}}
               {{@dummy.user.location}}
               {{d-icon "globe"}}
               <a
@@ -392,7 +392,7 @@
             {{/each}}
           </dd>
           <DButton
-            @icon="exclamation-triangle"
+            @icon="triangle-exclamation"
             @label="user.admin_delete"
             class="btn-danger"
           />
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index ad3b71fd2be..20b2ac926a8 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -996,7 +996,7 @@ RSpec.describe GroupsController do
                   incoming_email: "test@mail.org",
                   flair_bg_color: "FFF",
                   flair_color: "BBB",
-                  flair_icon: "fa-adjust",
+                  flair_icon: "fa-circle-half-stroke",
                   bio_raw: "testing",
                   full_name: "awesome team",
                   public_admission: true,
@@ -1018,7 +1018,7 @@ RSpec.describe GroupsController do
 
         expect(group.flair_bg_color).to eq("FFF")
         expect(group.flair_color).to eq("BBB")
-        expect(group.flair_url).to eq("fa-adjust")
+        expect(group.flair_url).to eq("fa-circle-half-stroke")
         expect(group.bio_raw).to eq("testing")
         expect(group.full_name).to eq("awesome team")
         expect(group.public_admission).to eq(true)
@@ -1104,7 +1104,7 @@ RSpec.describe GroupsController do
               group: {
                 flair_bg_color: "FFF",
                 flair_color: "BBB",
-                flair_icon: "fa-adjust",
+                flair_icon: "fa-circle-half-stroke",
                 name: "testing",
                 visibility_level: 1,
                 mentionable_level: 1,
@@ -1122,8 +1122,8 @@ RSpec.describe GroupsController do
         group.reload
         expect(group.flair_bg_color).to eq("FFF")
         expect(group.flair_color).to eq("BBB")
-        expect(group.flair_icon).to eq("fa-adjust")
-        expect(group.flair_url).to eq("fa-adjust")
+        expect(group.flair_icon).to eq("fa-circle-half-stroke")
+        expect(group.flair_url).to eq("fa-circle-half-stroke")
         expect(group.name).to eq("admins")
         expect(group.visibility_level).to eq(1)
         expect(group.mentionable_level).to eq(1)
@@ -1349,7 +1349,7 @@ RSpec.describe GroupsController do
               group: {
                 flair_bg_color: "FFF",
                 flair_color: "BBB",
-                flair_icon: "fa-adjust",
+                flair_icon: "fa-circle-half-stroke",
                 mentionable_level: 1,
                 messageable_level: 1,
                 default_notification_level: 1,
@@ -1361,8 +1361,8 @@ RSpec.describe GroupsController do
         group.reload
         expect(group.flair_bg_color).to eq("FFF")
         expect(group.flair_color).to eq("BBB")
-        expect(group.flair_icon).to eq("fa-adjust")
-        expect(group.flair_url).to eq("fa-adjust")
+        expect(group.flair_icon).to eq("fa-circle-half-stroke")
+        expect(group.flair_url).to eq("fa-circle-half-stroke")
         expect(group.name).to eq("trust_level_4")
         expect(group.mentionable_level).to eq(1)
         expect(group.messageable_level).to eq(1)
diff --git a/spec/requests/sidebar_sections_controller_spec.rb b/spec/requests/sidebar_sections_controller_spec.rb
index 59434a7355d..e55549383d6 100644
--- a/spec/requests/sidebar_sections_controller_spec.rb
+++ b/spec/requests/sidebar_sections_controller_spec.rb
@@ -54,8 +54,8 @@ RSpec.describe SidebarSectionsController do
                  value: "http://#{Discourse.current_hostname}/categories",
                },
                { icon: "address-book", name: "tags", value: "/tags" },
-               { icon: "external-link-alt", name: "Discourse", value: "https://discourse.org" },
-               { icon: "external-link-alt", name: "My preferences", value: "/my/preferences" },
+               { icon: "up-right-from-square", name: "Discourse", value: "https://discourse.org" },
+               { icon: "up-right-from-square", name: "My preferences", value: "/my/preferences" },
              ],
            }
 
@@ -77,11 +77,11 @@ RSpec.describe SidebarSectionsController do
       expect(sidebar_section.sidebar_urls.second.name).to eq("tags")
       expect(sidebar_section.sidebar_urls.second.value).to eq("/tags")
       expect(sidebar_section.sidebar_urls.second.external).to be false
-      expect(sidebar_section.sidebar_urls.third.icon).to eq("external-link-alt")
+      expect(sidebar_section.sidebar_urls.third.icon).to eq("up-right-from-square")
       expect(sidebar_section.sidebar_urls.third.name).to eq("Discourse")
       expect(sidebar_section.sidebar_urls.third.value).to eq("https://discourse.org")
       expect(sidebar_section.sidebar_urls.third.external).to be true
-      expect(sidebar_section.sidebar_urls.fourth.icon).to eq("external-link-alt")
+      expect(sidebar_section.sidebar_urls.fourth.icon).to eq("up-right-from-square")
       expect(sidebar_section.sidebar_urls.fourth.name).to eq("My preferences")
       expect(sidebar_section.sidebar_urls.fourth.value).to eq("/my/preferences")
       expect(sidebar_section.sidebar_urls.fourth.external).to be false
@@ -94,7 +94,7 @@ RSpec.describe SidebarSectionsController do
 
       links =
         6.times.map do
-          { icon: "external-link-alt", name: "My preferences", value: "/my/preferences" }
+          { icon: "up-right-from-square", name: "My preferences", value: "/my/preferences" }
         end
 
       post "/sidebar_sections.json", params: { title: "custom section", links: links }
@@ -261,7 +261,7 @@ RSpec.describe SidebarSectionsController do
 
       links =
         6.times.map do
-          { icon: "external-link-alt", name: "My preferences", value: "/my/preferences" }
+          { icon: "up-right-from-square", name: "My preferences", value: "/my/preferences" }
         end
 
       put "/sidebar_sections/#{sidebar_section.id}.json",
diff --git a/spec/system/admin_badges_spec.rb b/spec/system/admin_badges_spec.rb
index 35a3aa12a56..108b15cc530 100644
--- a/spec/system/admin_badges_spec.rb
+++ b/spec/system/admin_badges_spec.rb
@@ -30,7 +30,7 @@ describe "Admin Badges Page", type: :system do
       expect(form.field("show_posts")).to be_disabled
       expect(form.field("show_posts")).to be_unchecked
       expect(form.field("icon")).to be_enabled
-      expect(form.field("icon")).to have_value("user-edit")
+      expect(form.field("icon")).to have_value("user-pen")
       expect(form.container("name")).to have_content(badge.name.strip)
       expect(form.container("description")).to have_content(badge.description.strip)
       expect(form.container("long_description")).to have_content(badge.long_description.strip)
diff --git a/spec/system/admin_embeddable_hosts_spec.rb b/spec/system/admin_embeddable_hosts_spec.rb
index 0f033786e1c..26fd6525cd0 100644
--- a/spec/system/admin_embeddable_hosts_spec.rb
+++ b/spec/system/admin_embeddable_hosts_spec.rb
@@ -38,10 +38,7 @@ RSpec.describe "Admin EmbeddableHost Management", type: :system do
 
     # Editing
 
-    find(".embeddable-hosts tr:first-child .controls svg.d-icon-pencil-alt").find(
-      :xpath,
-      "..",
-    ).click
+    find(".embeddable-hosts tr:first-child .controls svg.d-icon-pencil").find(:xpath, "..").click
 
     within find(".embeddable-hosts tr:first-child.ember-view") do
       find('input[placeholder="example.com"]').set("updated-example.com")
diff --git a/spec/system/private_message_map_spec.rb b/spec/system/private_message_map_spec.rb
index 39160a5dc6b..e11395baa16 100644
--- a/spec/system/private_message_map_spec.rb
+++ b/spec/system/private_message_map_spec.rb
@@ -137,7 +137,7 @@ describe "Topic Map - Private Message", type: :system do
     # removing participants
     private_message_map.toggle_edit_participants_button
     private_message_map.participants_details.each do |details|
-      expect(details).to have_css(".remove-invited .d-icon-times")
+      expect(details).to have_css(".remove-invited .d-icon-xmark")
     end
     private_message_map.click_remove_participant_button(last_post_user)
     expect(private_message_remove_participant_modal).to be_open