diff --git a/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars b/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars
index 4ff21636b..e0fd4a8a4 100644
--- a/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars
@@ -25,7 +25,7 @@
 
   {{#if user}}
     <div class="metadata">
-      {{#if user.location}}<h3><i class="fa fa-map-marker"></i> {{user.location}}</h3>{{/if}}
+      {{#if user.location}}<h3>{{fa-icon "map-marker"}} {{user.location}}</h3>{{/if}}
       <h3>{{i18n last_post}} {{date path="user.last_posted_at" leaveAgo="true"}}</h3>
       <h3>{{i18n joined}} {{date path="user.created_at" leaveAgo="true"}}</h3>
       {{groups-list groups=user.custom_groups}}
@@ -34,7 +34,7 @@
     <div class='bottom'>
       {{#if isSuspended}}
         <div class='suspended'>
-          <i class='fa fa-ban'></i>
+          {{fa-icon "ban"}}
           <b>{{i18n user.suspended_notice date="user.suspendedTillDate"}}</b><br/>
           <b>{{i18n user.suspended_reason}}</b> {{user.suspend_reason}}
         </div>
@@ -43,17 +43,17 @@
       {{/if}}
 
       {{#if user.can_send_private_message_to_user}}
-        <button class='btn btn-primary' {{action composePrivateMessage user}}><i class='fa fa-envelope'></i>{{i18n user.private_message}}</button>
+        <button class='btn btn-primary' {{action composePrivateMessage user}}>{{fa-icon "envelope"}}{{i18n user.private_message}}</button>
       {{/if}}
 
-      {{#link-to 'user' user class="btn"}}<i class='fa fa-user'></i>{{i18n user.profile}}{{/link-to}}
+      {{#link-to 'user' user class="btn"}}{{fa-icon "user"}}{{i18n user.profile}}{{/link-to}}
 
       {{#if showFilter}}
-        <button class='btn' {{action togglePosts user}}><i class='fa fa-filter'></i>{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</button>
+      <button class='btn' {{action togglePosts user}}>{{fa-icon "filter"}}{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</button>
       {{/if}}
 
       {{#if hasUserFilters}}
-        <button class='btn' {{action cancelFilter}}><i class='fa fa-times'></i>{{i18n topic.filters.cancel}}</button>
+      <button class='btn' {{action cancelFilter}}>{{fa-icon "times"}}{{i18n topic.filters.cancel}}</button>
       {{/if}}
     </div>
   {{else}}