diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss
index e60654042..f83e6d0ce 100644
--- a/dashboard/src/theme.scss
+++ b/dashboard/src/theme.scss
@@ -1441,6 +1441,23 @@ footer {
 // Settings
 // ----------------------------
 
+.picture-edit-indicator {
+    position: absolute;
+    bottom: -4px;
+    right: -4px;
+    border-radius: 20px;
+    padding: 5px;
+    color: $text-dark;
+    background-color: white;
+    transition: all 250ms;
+}
+
+div:hover > .picture-edit-indicator {
+    color: white;
+    background: $brand-primary;
+    transform: scale(1.2);
+}
+
 .settings-avatar {
     position: relative;
     cursor: pointer;
@@ -1458,23 +1475,6 @@ footer {
         width: 100%;
         height: 100%;
     }
-
-    .overlay {
-        position: absolute;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        background-color: rgba(127, 127, 127 ,0.3);
-        background-image: url('/img/plus.png');
-        background-repeat: no-repeat;
-        background-position: center;
-        transition: all 150ms;
-        opacity: 0;
-
-        &:hover {
-            opacity: 1;
-        }
-    }
 }
 
 .settings-avatar-selector {
@@ -1681,23 +1681,6 @@ footer {
         width: 100%;
         height: 100%;
     }
-
-    .overlay {
-        position: absolute;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        background-color: rgba(127, 127, 127 ,0.3);
-        background-image: url('/img/plus.png');
-        background-repeat: no-repeat;
-        background-position: center;
-        transition: all 150ms;
-        opacity: 0;
-
-        &:hover {
-            opacity: 1;
-        }
-    }
 }
 
 .branding-avatar-selector {
@@ -1758,23 +1741,6 @@ footer {
         width: 100%;
         height: 100%;
     }
-
-    .overlay {
-        position: absolute;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        background-color: rgba(127, 127, 127 ,0.3);
-        background-image: url('/img/plus.png');
-        background-repeat: no-repeat;
-        background-position: center;
-        transition: all 150ms;
-        opacity: 0;
-
-        &:hover {
-            opacity: 1;
-        }
-    }
 }
 
 // ----------------------------
diff --git a/dashboard/src/views/branding.html b/dashboard/src/views/branding.html
index 2b0ec2236..c81ef4d91 100644
--- a/dashboard/src/views/branding.html
+++ b/dashboard/src/views/branding.html
@@ -49,7 +49,7 @@
               </div>
               <div class="branding-avatar" ng-click="avatarChange.showChangeAvatar()">
                 <img ng-src="{{ about.avatarUrl() }}"/>
-                <div class="overlay"></div>
+                <i class="picture-edit-indicator fa fa-pencil-alt"></i>
               </div>
             </div>
 
@@ -59,7 +59,7 @@
                 <label for="userBackgroundInput" class="control-label">Use background image</label>
                 <div class="branding-background" ng-show="background.enabled" ng-click="background.selectNew()">
                   <img ng-src="{{ background.url() }}" onerror="this.src = '/img/background-image-placeholder.svg'"/>
-                  <div class="overlay"></div>
+                  <i class="picture-edit-indicator fa fa-pencil-alt"></i>
                 </div>
                 <input type="file" id="backgroundFileInput" style="display: none" accept="image/*"/>
               </div>
diff --git a/dashboard/src/views/profile.html b/dashboard/src/views/profile.html
index 137025c34..0dd5f4e8f 100644
--- a/dashboard/src/views/profile.html
+++ b/dashboard/src/views/profile.html
@@ -395,8 +395,8 @@
     <div class="grid-item-top">
       <div class="row">
         <div class="col-xs-3" style="min-width: 150px;">
-          <div class="settings-avatar" style="background-image: url('{{ user.avatarUrl }}');">
-            <div class="overlay" ng-click="avatarChange.showChangeAvatar()"></div>
+          <div class="settings-avatar" style="background-image: url('{{ user.avatarUrl }}');" ng-click="avatarChange.showChangeAvatar()">
+            <i class="picture-edit-indicator fa fa-pencil-alt"></i>
           </div>
         </div>
         <div class="col-xs-9">