diff --git a/src/theme.scss b/src/theme.scss
index 10fce889a..bbae04a90 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -395,6 +395,7 @@ multiselect {
 
 // same as settings-avatar
 .app-custom-icon {
+    position: relative;
     cursor: pointer;
     width: 64px;
     height: 64px;
@@ -404,9 +405,17 @@ multiselect {
     border: 1px solid gray;
     border-radius: 3px;
 
-    .overlay {
+    img {
+        display: block;
         width: 100%;
         height: 100%;
+    }
+
+    .overlay {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 0;
         background-color: rgba(255, 255, 255 ,0.3);
         background-image: url('/img/plus.png');
         background-repeat: no-repeat;
diff --git a/src/views/app.html b/src/views/app.html
index eb6701dc4..5c73c7570 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -328,7 +328,8 @@
                   <div>
                     <label class="control-label">Icon</label>
                   </div>
-                  <div id="previewIcon" class="app-custom-icon" ng-click="display.showCustomIconSelector()" style="background-image: url('{{ display.iconUrl() }}');">
+                  <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>
                   </div>
                   <a href="" style="font-weight: normal;" ng-click="display.resetCustomIcon()">Reset Icon</a>