diff --git a/static/js/app/views/user/userProfileView.coffee b/static/js/app/views/user/userProfileView.coffee
index f9219d7..067f698 100644
--- a/static/js/app/views/user/userProfileView.coffee
+++ b/static/js/app/views/user/userProfileView.coffee
@@ -17,17 +17,19 @@ define ['app', 'utils', 'moment', 'marionette', 'vent', 'app.lib/editableView',
 
         onDomRefresh: ->
             console.log("UserProfileView: initialize")
-            @setupImageEditable
-                el: $("#avatar", @el)
-                url: "/ajax/upload_avatar_image/"
-                chooseMessage: "Choose profile image"
+
 
             $.fn.editable.defaults.mode = "inline"
             $.fn.editableform.loading = "<div class='editableform-loading'><i class='light-blue icon-2x icon-spinner icon-spin'></i></div>"
-            $.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"icon-ok icon-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"icon-remove\"></i></button>"
+            $.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"fa fa-check fa-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"fa fa-times fa-white\"></i></button>"
 
             #editables
             if utils.isMe(@model.get("id"))
+                @setupImageEditable
+                    el: $("#avatar", @el)
+                    url: "/ajax/upload_avatar_image/"
+                    chooseMessage: "Choose profile image"
+
                 $("#about", @el).editable
                     mode: "inline"
                     type: "wysiwyg"
diff --git a/static/js/app/views/user/userProfileView.js b/static/js/app/views/user/userProfileView.js
index 6ed9710..48cdfb1 100644
--- a/static/js/app/views/user/userProfileView.js
+++ b/static/js/app/views/user/userProfileView.js
@@ -39,15 +39,15 @@
       UserProfileView.prototype.onDomRefresh = function() {
         var _this = this;
         console.log("UserProfileView: initialize");
-        this.setupImageEditable({
-          el: $("#avatar", this.el),
-          url: "/ajax/upload_avatar_image/",
-          chooseMessage: "Choose profile image"
-        });
         $.fn.editable.defaults.mode = "inline";
         $.fn.editableform.loading = "<div class='editableform-loading'><i class='light-blue icon-2x icon-spinner icon-spin'></i></div>";
-        $.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"icon-ok icon-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"icon-remove\"></i></button>";
+        $.fn.editableform.buttons = "<button type=\"submit\" class=\"btn btn-info editable-submit\"><i class=\"fa fa-check fa-white\"></i></button>" + "<button type=\"button\" class=\"btn editable-cancel\"><i class=\"fa fa-times fa-white\"></i></button>";
         if (utils.isMe(this.model.get("id"))) {
+          this.setupImageEditable({
+            el: $("#avatar", this.el),
+            url: "/ajax/upload_avatar_image/",
+            chooseMessage: "Choose profile image"
+          });
           $("#about", this.el).editable({
             mode: "inline",
             type: "wysiwyg",
diff --git a/templates/views/UserProfileView.html b/templates/views/UserProfileView.html
index fab4455..5ff71b9 100644
--- a/templates/views/UserProfileView.html
+++ b/templates/views/UserProfileView.html
@@ -6,7 +6,7 @@
                 <div>
                     <span class="profile-picture">
                         <img id="avatar"
-                        class="editable img-responsive image-user-profile"
+                        class="img-responsive image-user-profile"
                         alt="Avatar Image"
                         src="<%= avatar_image %>">
                     </span>