diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 1c82ee5a20f..14191e90234 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -69,7 +69,7 @@
             </div>
           {{else}}
             <div class="alert alert-info report-alert no-data">
-              {{d-icon "pie-chart"}}
+              {{d-icon "chart-pie"}}
               {{#if model.reportUrl}}
                 <a href="{{model.reportUrl}}" class="report-url">
                   <span>
@@ -192,7 +192,7 @@
                 class="refresh-report-btn btn-primary"
                 action=(action "refreshReport")
                 label="admin.dashboard.reports.refresh_report"
-                icon="refresh"}}
+                icon="sync"}}
             </div>
           </div>
         {{/if}}
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 4d7c6cbbbef..7e1766583e4 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -26,13 +26,13 @@
     <div class="dashboard-stats totals">
       <table>
         <tr>
-          <td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td>
+          <td class="title">{{d-icon "shield-alt"}} {{i18n 'admin.dashboard.admins'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td>
           <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
         </tr>
         <tr>
-          <td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td>
+          <td class="title">{{d-icon "shield-alt"}} {{i18n 'admin.dashboard.moderators'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td>
           <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.silenced'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'silenced'}}{{silenced}}{{/link-to}}</td>
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index a82f4e0432a..6aab3866b91 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -95,10 +95,10 @@
             {{/if}}
             <td class="user-status">
               {{#if user.admin}}
-                {{d-icon "shield" title="admin.title" }}
+                {{d-icon "shield-alt" title="admin.title" }}
               {{/if}}
               {{#if user.moderator}}
-                {{d-icon "shield" title="admin.moderator" }}
+                {{d-icon "shield-alt" title="admin.moderator" }}
               {{/if}}
               {{#if user.second_factor_enabled}}
                 {{d-icon "lock" title="admin.user.second_factor_enabled" }}
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 2b3aeda63c5..3d27a0f7246 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -41,7 +41,7 @@
             <td class='group-owner'>
               {{#if m.owner}}
                 <strong class="group-owner-label">
-                  {{d-icon "shield"}}
+                  {{d-icon "shield-alt"}}
                 </strong>
               {{/if}}
             </td>
diff --git a/app/models/report.rb b/app/models/report.rb
index 57a40b06743..a89e98828a4 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -648,10 +648,10 @@ class Report
     url = Proc.new { |key| "/admin/users/list/#{key}" }
 
     admins = User.real.admins.count
-    report.data << { url: url.call("admins"), icon: "shield", key: "admins", x: label.call("admin"), y: admins } if admins > 0
+    report.data << { url: url.call("admins"), icon: "shield-alt", key: "admins", x: label.call("admin"), y: admins } if admins > 0
 
     moderators = User.real.moderators.count
-    report.data << { url: url.call("moderators"), icon: "shield", key: "moderators", x: label.call("moderator"), y: moderators } if moderators > 0
+    report.data << { url: url.call("moderators"), icon: "shield-alt", key: "moderators", x: label.call("moderator"), y: moderators } if moderators > 0
 
     suspended = User.real.suspended.count
     report.data << { url: url.call("suspended"), icon: "ban", key: "suspended", x: label.call("suspended"), y: suspended } if suspended > 0