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 d82dbcad8e4..b250e42ecd0 100644
--- a/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs
@@ -205,7 +205,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/themes-grid-card.gjs b/app/assets/javascripts/admin/addon/components/themes-grid-card.gjs
index 493140dfc09..b07e10c0a82 100644
--- a/app/assets/javascripts/admin/addon/components/themes-grid-card.gjs
+++ b/app/assets/javascripts/admin/addon/components/themes-grid-card.gjs
@@ -116,7 +116,7 @@ export default class ThemeCard extends Component {
           <span
             title={{i18n "admin.customize.theme.updates_available_tooltip"}}
             class="theme-card__update-available"
-          >{{icon "info-circle"}}</span>
+          >{{icon "circle-info"}}</span>
         {{/if}}
         <div class="theme-card__image-wrapper">
           {{#if @theme.screenshot_url}}
diff --git a/app/assets/javascripts/admin/addon/components/version-checks.hbs b/app/assets/javascripts/admin/addon/components/version-checks.hbs
index 2e7ba134339..3a3ad1a73e3 100644
--- a/app/assets/javascripts/admin/addon/components/version-checks.hbs
+++ b/app/assets/javascripts/admin/addon/components/version-checks.hbs
@@ -108,7 +108,7 @@
               }}"
           >
             {{#if this.versionCheck.behindByOneVersion}}
-              {{d-icon "far-meh"}}
+              {{d-icon "far-face-meh"}}
             {{else}}
               {{d-icon "far-face-frown"}}
             {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs
index b1a5ac21a9b..a9daf9b951a 100644
--- a/app/assets/javascripts/admin/addon/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs
@@ -10,7 +10,7 @@
     {{#if this.model.can_view_action_logs}}
       <DButton
         @action={{fn this.viewActionLogs this.model.username}}
-        @icon="far-list-alt"
+        @icon="far-rectangle-list"
         @label="admin.user.action_logs"
         class="btn-default"
       />
@@ -850,7 +850,7 @@
           {{else}}
             <DButton
               @action={{fn this.checkSsoPayload this.model}}
-              @icon="far-list-alt"
+              @icon="far-rectangle-list"
               @label="admin.users.check_sso.text"
               @title="admin.users.check_sso.title"
               class="btn-default"
diff --git a/app/assets/javascripts/discourse/app/components/post/menu/buttons/read.gjs b/app/assets/javascripts/discourse/app/components/post/menu/buttons/read.gjs
index f6db21b6c76..aec8ecd9bfe 100644
--- a/app/assets/javascripts/discourse/app/components/post/menu/buttons/read.gjs
+++ b/app/assets/javascripts/discourse/app/components/post/menu/buttons/read.gjs
@@ -25,7 +25,7 @@ export default class PostMenuReadButton extends Component {
       <DButton
         ...attributes
         @action={{@buttonActions.toggleWhoRead}}
-        @icon="book-reader"
+        @icon="book-open-reader"
         @title="post.controls.read_indicator"
       />
     </div>
diff --git a/app/assets/javascripts/discourse/app/components/post/menu/buttons/show-more.gjs b/app/assets/javascripts/discourse/app/components/post/menu/buttons/show-more.gjs
index 4f854a64880..d4aaa78c650 100644
--- a/app/assets/javascripts/discourse/app/components/post/menu/buttons/show-more.gjs
+++ b/app/assets/javascripts/discourse/app/components/post/menu/buttons/show-more.gjs
@@ -11,7 +11,7 @@ export default class PostMenuShowMoreButton extends Component {
       class="post-action-menu__show-more show-more-actions"
       ...attributes
       @action={{@buttonActions.showMoreActions}}
-      @icon="ellipsis-h"
+      @icon="ellipsis"
       @title="show_more"
     />
   </template>
diff --git a/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs b/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs
index 08b04133d91..db4e57446f7 100644
--- a/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs
+++ b/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs
@@ -94,7 +94,7 @@ export default class AdminChatIncomingWebhooksList extends Component {
                 >{{i18n "chat.incoming_webhooks.edit"}}</LinkTo>
 
                 <DButton
-                  @icon="trash-alt"
+                  @icon="trash-can"
                   @title="chat.incoming_webhooks.delete"
                   @action={{fn this.destroyWebhook webhook}}
                   class="btn-danger btn-small admin-chat-incoming-webhooks-delete"
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 40914b47153..2e100589db9 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-square-check"
+register_svg_icon "far-square-check"
 
 enabled_site_setting :poll_enabled
 hide_plugin