diff --git a/src/theme.scss b/src/theme.scss
index de44f20bb..140e039ed 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -382,6 +382,31 @@ multiselect {
     }
 }
 
+// same as settings-avatar
+.app-custom-icon {
+    cursor: pointer;
+    width: 128px;
+    height: 128px;
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+
+    .overlay {
+        width: 100%;
+        height: 100%;
+        background-color: rgba(255, 255, 255 ,0.3);
+        background-image: url('/img/plus.png');
+        background-repeat: no-repeat;
+        background-position: center;
+        transition: all 150ms;
+        opacity: 0;
+
+        &:hover {
+            opacity: 1;
+        }
+    }
+}
+
 
 // ----------------------------
 // Appstore view
diff --git a/src/views/apps.html b/src/views/apps.html
index 18ed6ea4e..cfdec2bb6 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -101,9 +101,9 @@
                             <uib-tab index="'display'" heading="Display">
                               <br/>
                               <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.label.$dirty && appConfigure.error.label }">
-                                  <label class="control-label">Label</label>
-                                  <div class="control-label" ng-show="appConfigure.error.label">{{appConfigure.error.label}}</div>
-                                  <input type="text" class="form-control" id="appConfigureLabelInput" name="label" ng-model="appConfigure.label">
+                                <label class="control-label">Label</label>
+                                <div class="control-label" ng-show="appConfigure.error.label">{{appConfigure.error.label}}</div>
+                                <input type="text" class="form-control" id="appConfigureLabelInput" name="label" ng-model="appConfigure.label">
                               </div>
                               <div class="form-group">
                                 <label class="control-label">Tags</label>
@@ -112,10 +112,10 @@
                               <div class="form-group">
                                 <label class="control-label">Icon</label>
                                 <a href="" class="pull-right" style="font-weight: normal;" ng-click="appConfigure.resetCustomIcon()">Reset</a>
-                                <div>
-                                  <img id="previewIcon" width="128" height="128" ng-src="{{appConfigure.icon.data || appConfigure.icon.url || appConfigure.app.iconUrl}}" ng-click="appConfigure.showCustomIconSelector()"/>
-                                  <input type="file" id="iconFileInput" style="display: none" accept="image/png"/>
+                                <div id="previewIcon" class="app-custom-icon" ng-click="appConfigure.showCustomIconSelector()" style="background-image: url('{{appConfigure.icon.data || appConfigure.icon.url || appConfigure.app.iconUrl}}');">
+                                  <div class="overlay"></div>
                                 </div>
+                                <input type="file" id="iconFileInput" style="display: none" accept="image/png"/>
                               </div>
                             </uib-tab>