diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
index 435fbaaee45..4abbef9cbe7 100644
--- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars
+++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -64,7 +64,7 @@
         <td class="value">{{#link-to 'adminUsersList.suspended'}}{{suspended}}{{/link-to}}</td>
       </tr>
       <tr>
-        <td class="title"><i class='fa fa-magic'></i> {{i18n admin.dashboard.moderators}}</td>
+        <td class="title"><i class='fa fa-shield'></i> {{i18n admin.dashboard.moderators}}</td>
         <td class="value">{{#link-to 'adminUsersList.moderators'}}{{moderators}}{{/link-to}}</td>
         <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.blocked}}</td>
         <td class="value">{{#link-to 'adminUsersList.blocked'}}{{blocked}}{{/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 02a04a8d03a..1d5d5c099b9 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -218,13 +218,13 @@
     <div class='controls'>
       {{#if can_revoke_moderation}}
         <button class='btn' {{action revokeModeration target="content"}}>
-          <i class='fa fa-magic'></i>
+          <i class='fa fa-shield'></i>
           {{i18n admin.user.revoke_moderation}}
         </button>
       {{/if}}
       {{#if can_grant_moderation}}
         <button class='btn' {{action grantModeration target="content"}}>
-          <i class='fa fa-magic'></i>
+          <i class='fa fa-shield'></i>
           {{i18n admin.user.grant_moderation}}
         </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 3618935c9fd..1dced303fff 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -87,7 +87,7 @@
             {{/if}}
             <td>
               {{#if admin}}<i class="fa fa-shield" title="{{i18n admin.title}}"></i>{{/if}}
-              {{#if moderator}}<i class="fa fa-magic" title="{{i18n admin.moderator}}"></i>{{/if}}
+              {{#if moderator}}<i class="fa fa-shield" title="{{i18n admin.moderator}}"></i>{{/if}}
             <td>
           </tr>
         {{/each}}
diff --git a/app/assets/javascripts/discourse/components/poster-name.js.es6 b/app/assets/javascripts/discourse/components/poster-name.js.es6
index e0033f1ab71..4331af9d93a 100644
--- a/app/assets/javascripts/discourse/components/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/components/poster-name.js.es6
@@ -88,7 +88,7 @@ var PosterNameComponent = Em.Component.extend({
       return '<i class="fa fa-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>';
+      return '<i class="fa fa-shield" title="' + desc +  '" alt="' + desc + '"></i>';
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 5d198687735..6896cf2dd5e 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -85,7 +85,7 @@ Discourse.User = Discourse.Model.extend({
     }
     if(this.get('moderator')){
       desc = I18n.t('user.moderator', {user: name});
-      return '<i class="fa fa-magic" title="' + desc +  '" alt="' + desc + '"></i>';
+      return '<i class="fa fa-shield" title="' + desc +  '" alt="' + desc + '"></i>';
     }
     return null;
   }.property('admin','moderator'),