diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
index ae70b1702a7..93b8f5dad84 100644
--- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars
+++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -58,7 +58,7 @@
   <div class="dashboard-stats totals">
     <table>
       <tr>
-        <td class="title"><i class='fa fa-trophy'></i> {{i18n admin.dashboard.admins}}</td>
+        <td class="title"><i class='fa icon-shield'></i> {{i18n admin.dashboard.admins}}</td>
         <td class="value">{{#link-to 'adminUsersList.admins'}}{{admins}}{{/link-to}}</td>
         <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.suspended}}</td>
         <td class="value">{{#link-to 'adminUsersList.suspended'}}{{suspended}}{{/link-to}}</td>
diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars
index 513abfabe60..90fd817b6c8 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -199,13 +199,13 @@
     <div class='controls'>
       {{#if can_revoke_admin}}
         <button class='btn' {{action revokeAdmin target="content"}}>
-          <i class='fa fa-trophy'></i>
+          <i class='fa icon-shield'></i>
           {{i18n admin.user.revoke_admin}}
         </button>
       {{/if}}
       {{#if can_grant_admin}}
         <button class='btn' {{action grantAdmin target="content"}}>
-          <i class='fa fa-trophy'></i>
+          <i class='fa icon-shield'></i>
           {{i18n admin.user.grant_admin}}
         </button>
       {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index 131036732a3..3376ca0b58a 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -86,7 +86,7 @@
             </td>
             {{/if}}
             <td>
-              {{#if admin}}<i class="fa fa-trophy" title="{{i18n admin.title}}"></i>{{/if}}
+              {{#if admin}}<i class="fa icon-shield" title="{{i18n admin.title}}"></i>{{/if}}
               {{#if moderator}}<i class="fa fa-magic" title="{{i18n admin.moderator}}"></i>{{/if}}
             <td>
           </tr>
diff --git a/app/assets/javascripts/discourse/components/poster-name.js.es6 b/app/assets/javascripts/discourse/components/poster-name.js.es6
index 4cb479bae9c..ee0e5a40a13 100644
--- a/app/assets/javascripts/discourse/components/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/components/poster-name.js.es6
@@ -85,7 +85,7 @@ var PosterNameComponent = Em.Component.extend({
 
     if(post.get('admin')) {
       desc = I18n.t('user.admin_tooltip');
-      return '<i class="fa fa-trophy" title="' + desc +  '" alt="' + desc + '"></i>';
+      return '<i class="fa icon-shield" title="' + desc +  '" alt="' + desc + '"></i>';
     } else if(post.get('moderator')) {
       desc = I18n.t('user.moderator_tooltip');
       return '<i class="fa fa-magic" title="' + desc +  '" alt="' + desc + '"></i>';
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index bdb94e0c9ea..c1146e8a35a 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -81,7 +81,7 @@ Discourse.User = Discourse.Model.extend({
 
     if(this.get('admin')) {
       desc = I18n.t('user.admin', {user: name});
-      return '<i class="fa fa-trophy" title="' + desc +  '" alt="' + desc + '"></i>';
+      return '<i class="fa icon-shield" title="' + desc +  '" alt="' + desc + '"></i>';
     }
     if(this.get('moderator')){
       desc = I18n.t('user.moderator', {user: name});