diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss
index 25afb4da7..0a7cb5dfb 100644
--- a/dashboard/src/theme.scss
+++ b/dashboard/src/theme.scss
@@ -591,6 +591,7 @@ multiselect {
     cursor: pointer;
     width: 64px;
     height: 64px;
+    margin-bottom: 5px;
     background-position: center;
     background-size: 100% 100%;
     background-repeat: no-repeat;
diff --git a/dashboard/src/views/app.html b/dashboard/src/views/app.html
index c9737458d..cf422bf67 100644
--- a/dashboard/src/views/app.html
+++ b/dashboard/src/views/app.html
@@ -740,7 +740,7 @@
                   </div>
                   <div id="previewIcon" class="app-custom-icon" ng-click="display.showCustomIconSelector()">
                     <img ng-src="{{ display.iconUrl() || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)"/>
-                    <div class="overlay"></div>
+                    <i class="picture-edit-indicator fa fa-pencil-alt"></i>
                   </div>
                   <a href="" style="font-weight: normal;" ng-click="display.resetCustomIcon()">{{ 'app.display.iconResetAction' | tr }}</a>
                   <input type="file" id="iconFileInput" style="display: none" accept="image/png"/>
diff --git a/dashboard/src/views/apps.html b/dashboard/src/views/apps.html
index 3f1770c4a..6f03b5b2f 100644
--- a/dashboard/src/views/apps.html
+++ b/dashboard/src/views/apps.html
@@ -57,7 +57,7 @@
             </div>
             <div id="previewIcon" class="app-custom-icon" ng-click="applinksEdit.showCustomIconSelector()">
               <img ng-src="{{ applinksEdit.iconUrl() || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)"/>
-              <div class="overlay"></div>
+              <i class="picture-edit-indicator fa fa-pencil-alt"></i>
             </div>
             <a href="" style="font-weight: normal;" ng-click="applinksEdit.resetCustomIcon()">{{ 'app.applinks.clearIconAction' | tr }}</a> - <span class="text-small">{{ 'app.applinks.clearIconDescription' | tr }}</span>
             <input type="file" id="applinksEditIconFileInput" style="display: none" accept="image/png"/>