diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 00000000..058c3859
Binary files /dev/null and b/favicon.ico differ
diff --git a/index.html b/index.html
index ef66fb86..afd41c52 100644
--- a/index.html
+++ b/index.html
@@ -8,6 +8,7 @@
 <meta name="keywords" content="DICOM,HTML5,JavaScript,medical,imaging,DWV">
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 <meta name="theme-color" content="#2F3BA2"/>
+<link rel="icon" type="image/x-icon" href="favicon.ico">
 <link rel="manifest" href="manifest.json">
 <link type="text/css" rel="stylesheet" href="css/style.css" />
 <link type="text/css" rel="stylesheet" href="ext/jquery-mobile/jquery.mobile-1.4.5.min.css" />
@@ -29,19 +30,19 @@
 </style>
 <!-- mobile web app -->
 <meta name="mobile-web-app-capable" content="yes" />
-<link rel="shortcut icon" sizes="16x16" href="resources/icons/dwv-16.png" />
-<link rel="shortcut icon" sizes="32x32" href="resources/icons/dwv-32.png" />
-<link rel="shortcut icon" sizes="64x64" href="resources/icons/dwv-64.png" />
-<link rel="shortcut icon" sizes="128x128" href="resources/icons/dwv-128.png" />
-<link rel="shortcut icon" sizes="256x256" href="resources/icons/dwv-256.png" />
+<link rel="shortcut icon" sizes="16x16" href="resources/icons/icon-16.png" />
+<link rel="shortcut icon" sizes="32x32" href="resources/icons/icon-32.png" />
+<link rel="shortcut icon" sizes="64x64" href="resources/icons/icon-64.png" />
+<link rel="shortcut icon" sizes="128x128" href="resources/icons/icon-128.png" />
+<link rel="shortcut icon" sizes="256x256" href="resources/icons/icon-256.png" />
 <!-- apple specific -->
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-<link rel="apple-touch-icon" sizes="16x16" href="resources/icons/dwv-16.png" />
-<link rel="apple-touch-icon" sizes="32x32" href="resources/icons/dwv-32.png" />
-<link rel="apple-touch-icon" sizes="64x64" href="resources/icons/dwv-64.png" />
-<link rel="apple-touch-icon" sizes="128x128" href="resources/icons/dwv-128.png" />
-<link rel="apple-touch-icon" sizes="256x256" href="resources/icons/dwv-256.png" />
+<link rel="apple-touch-icon" sizes="16x16" href="resources/icons/icon-16.png" />
+<link rel="apple-touch-icon" sizes="32x32" href="resources/icons/icon-32.png" />
+<link rel="apple-touch-icon" sizes="64x64" href="resources/icons/icon-64.png" />
+<link rel="apple-touch-icon" sizes="128x128" href="resources/icons/icon-128.png" />
+<link rel="apple-touch-icon" sizes="256x256" href="resources/icons/icon-256.png" />
 <!-- Third party (dwv) -->
 <script type="text/javascript" src="node_modules/i18next/i18next.min.js"></script>
 <script type="text/javascript" src="node_modules/i18next-xhr-backend/i18nextXHRBackend.min.js"></script>
diff --git a/manifest.json b/manifest.json
index e1a174b5..88c18e1a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,29 +7,36 @@
   "theme_color": "#2F3BA2",
   "start_url": "/dwv-jqmobile/demo/trunk/index.html",
   "scope": "/dwv-jqmobile/demo/trunk",
-  "icons": [{
-      "src": "resources/icons/dwv-16.png",
+  "icons": [
+    {
+      "src": "resources/icons/icon-16.png",
       "sizes": "16x16",
       "type": "image/png"
-    }, {
-      "src": "resources/icons/dwv-32.png",
+    },
+    {
+      "src": "resources/icons/icon-32.png",
       "sizes": "32x32",
       "type": "image/png"
-    }, {
-      "src": "resources/icons/dwv-64.png",
+    },
+    {
+      "src": "resources/icons/icon-64.png",
       "sizes": "64x64",
       "type": "image/png"
-    }, {
-      "src": "resources/icons/dwv-128.png",
+    },
+    {
+      "src": "resources/icons/icon-128.png",
       "sizes": "128x128",
       "type": "image/png"
-    }, {
-      "src": "resources/icons/dwv-256.png",
+    },
+    {
+      "src": "resources/icons/icon-256.png",
       "sizes": "256x256",
       "type": "image/png"
-    }, {
-      "src": "resources/icons/dwv-512.png",
+    },
+    {
+      "src": "resources/icons/icon-512.png",
       "sizes": "512x512",
       "type": "image/png"
-    }]
+    }
+  ]
 }
diff --git a/resources/icons/dwv-128.png b/resources/icons/icon-128.png
similarity index 100%
rename from resources/icons/dwv-128.png
rename to resources/icons/icon-128.png
diff --git a/resources/icons/dwv-16.png b/resources/icons/icon-16.png
similarity index 100%
rename from resources/icons/dwv-16.png
rename to resources/icons/icon-16.png
diff --git a/resources/icons/dwv-256.png b/resources/icons/icon-256.png
similarity index 100%
rename from resources/icons/dwv-256.png
rename to resources/icons/icon-256.png
diff --git a/resources/icons/dwv-32.png b/resources/icons/icon-32.png
similarity index 100%
rename from resources/icons/dwv-32.png
rename to resources/icons/icon-32.png
diff --git a/resources/icons/dwv-512.png b/resources/icons/icon-512.png
similarity index 100%
rename from resources/icons/dwv-512.png
rename to resources/icons/icon-512.png
diff --git a/resources/icons/dwv-64.png b/resources/icons/icon-64.png
similarity index 100%
rename from resources/icons/dwv-64.png
rename to resources/icons/icon-64.png
diff --git a/resources/scripts/manifest.json b/resources/scripts/manifest.json
index c2b8737e..a776cb60 100644
--- a/resources/scripts/manifest.json
+++ b/resources/scripts/manifest.json
@@ -13,11 +13,11 @@
     }
   },
   "icons": {
-    "16": "resources/icons/dwv-16.png",
-    "32": "resources/icons/dwv-32.png",
-    "64": "resources/icons/dwv-64.png",
-    "128": "resources/icons/dwv-128.png",
-    "256": "resources/icons/dwv-256.png"
+    "16": "resources/icons/icon-16.png",
+    "32": "resources/icons/icon-32.png",
+    "64": "resources/icons/icon-64.png",
+    "128": "resources/icons/icon-128.png",
+    "256": "resources/icons/icon-256.png"
   },
   "offline_enabled": true,
   "container": "GOOGLE_DRIVE",
diff --git a/service-worker.js b/service-worker.js
index b561e1c8..045c7c47 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -16,11 +16,11 @@ var urlsToCache = [
     './src/google.js',
     './src/register-sw.js',
     // images
-    './resources/icons/dwv-16.png',
-    './resources/icons/dwv-32.png',
-    './resources/icons/dwv-64.png',
-    './resources/icons/dwv-128.png',
-    './resources/icons/dwv-256.png',
+    './resources/icons/icon-16.png',
+    './resources/icons/icon-32.png',
+    './resources/icons/icon-64.png',
+    './resources/icons/icon-128.png',
+    './resources/icons/icon-256.png',
     './resources/help/double_tap.png',
     './resources/help/tap_and_hold.png',
     './resources/help/tap.png',