diff --git a/core/client/assets/sass/layouts/users.scss b/core/client/assets/sass/layouts/users.scss
index d673a15ce2..a7d8a1afa0 100644
--- a/core/client/assets/sass/layouts/users.scss
+++ b/core/client/assets/sass/layouts/users.scss
@@ -221,15 +221,14 @@
     }
 
     .edit-user-image {
-        position: absolute;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        display: block;
+        @include position(absolute, 0px 0px 0px 0px);
         border-radius: 100%;
         background: rgba(0,0,0,0.5);
         opacity: 0;
         color: #fff;
+        line-height: 105px;
+        text-transform: uppercase;
+        text-decoration: none;
         @include transition(opacity 0.3s ease);
     }
 
diff --git a/core/client/tpl/settings/user-profile.hbs b/core/client/tpl/settings/user-profile.hbs
index 23d4bb78f5..20d3087354 100644
--- a/core/client/tpl/settings/user-profile.hbs
+++ b/core/client/tpl/settings/user-profile.hbs
@@ -10,7 +10,7 @@
 
     <header class="user-profile-header">
         <img id="user-cover" class="cover-image" src="{{#if cover}}{{cover}}{{else}}/shared/img/user-cover.png{{/if}}" title="{{name}}'s Cover Image"/>
-        <button class="edit-cover-image js-modal-cover">Change Cover</button>
+        <a class="edit-cover-image js-modal-cover button" href="#">Change Cover</a>
     </header>
 
     <form class="user-profile" novalidate="novalidate">
@@ -18,8 +18,8 @@
         <fieldset class="user-details-top">
 
             <figure class="user-image">
-                <a id="user-image" class="img" {{#if image}}style="background-image: url({{image}});"{{/if}} href="#"><span class="hidden">{{name}}'s Picture</span></a>
-                <button type="button" class="edit-user-image js-modal-image">Edit Picture</button>
+                <div id="user-image" class="img" {{#if image}}style="background-image: url({{image}});"{{/if}} href="#"><span class="hidden">{{name}}'s Picture</span></div>
+                <a href="#" class="edit-user-image js-modal-image">Edit Picture</a>
             </figure>
 
             <div class="form-group">