diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index e2aece57396..f8c86ba31fe 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -5,7 +5,7 @@
     <div class="controls">
       <span class='static'>{{username}}</span>
       {{#if can_edit_username}}
-        {{#linkTo "preferences.username" class="btn pad-left"}}{{i18n user.change}}{{/linkTo}}
+        {{#linkTo "preferences.username" class="btn pad-left"}}<i class="icon-pencil"></i>{{/linkTo}}
       {{/if}}
     </div>
     <div class='instructions'>
@@ -27,7 +27,7 @@
     <label class="control-label">{{i18n user.email.title}}</label>
     <div class="controls">
       <span class='static'>{{email}}</span>
-      {{#linkTo "preferences.email" class="btn pad-left"}}{{i18n user.change}}{{/linkTo}}
+      {{#linkTo "preferences.email" class="btn pad-left"}}<i class="icon-pencil"></i>{{/linkTo}}
     </div>
     <div class='instructions'>
       {{i18n user.email.instructions}}
@@ -37,7 +37,7 @@
   <div class="control-group">
     <label class="control-label">{{i18n user.password.title}}</label>
     <div class="controls">
-      <a href="#" {{action changePassword}} class='btn'>{{i18n user.change}}</a> {{passwordProgress}}
+      <a href="#" {{action changePassword}} class='btn'><i class="icon-pencil"></i></a> {{passwordProgress}}
     </div>
   </div>