diff --git a/Gruntfile.js b/Gruntfile.js
index 6719eac..97955c4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -400,7 +400,7 @@ module.exports = function(grunt) {
             icons: {
                 files: [{
                     expand: true,
-                    src: ['img/icons/*.svg','!img/icons/all.svg'],
+                    src: ['img/icons/*.svg', '!img/icons/all.svg'],
                     cwd: 'src/',
                     dest: 'compile/'
                 }]
@@ -527,7 +527,32 @@ module.exports = function(grunt) {
                         'js/mailreader-parser-worker.browserified.js',
                         'js/mailreader-parser-worker.min.js.map',
                         'js/tcp-socket-tls-worker.browserified.js',
-                        'js/tcp-socket-tls-worker.min.js.map'
+                        'js/tcp-socket-tls-worker.min.js.map',
+                        'img/icon-100-ios.png',
+                        'img/icon-114-ios.png',
+                        'img/icon-120-ios.png',
+                        'img/icon-128-chrome.png',
+                        'img/icon-144-android.png',
+                        'img/icon-144-ios.png',
+                        'img/icon-152-ios.png',
+                        'img/icon-180-ios.png',
+                        'img/icon-192-android.png',
+                        'img/icon-29-ios.png',
+                        'img/icon-36-android.png',
+                        'img/icon-40-ios.png',
+                        'img/icon-48-android.png',
+                        'img/icon-50-ios.png',
+                        'img/icon-57-ios.png',
+                        'img/icon-58-ios.png',
+                        'img/icon-60-android.png',
+                        'img/icon-60-ios.png',
+                        'img/icon-72-android.png',
+                        'img/icon-72-ios.png',
+                        'img/icon-76-ios.png',
+                        'img/icon-78-android.png',
+                        'img/icon-80-ios.png',
+                        'img/icon-87-ios.png',
+                        'img/icon-96-android.png'
                     ],
                     master: ['index.html']
                 },
diff --git a/src/img/icon-100-ios.png b/src/img/icon-100-ios.png
new file mode 100644
index 0000000..388d8c1
Binary files /dev/null and b/src/img/icon-100-ios.png differ
diff --git a/src/img/icon-114-ios.png b/src/img/icon-114-ios.png
new file mode 100644
index 0000000..7653c24
Binary files /dev/null and b/src/img/icon-114-ios.png differ
diff --git a/src/img/icon-128.png b/src/img/icon-128.png
deleted file mode 100644
index 8b60154..0000000
Binary files a/src/img/icon-128.png and /dev/null differ
diff --git a/src/img/icon-144-android.png b/src/img/icon-144-android.png
new file mode 100644
index 0000000..8f4641b
Binary files /dev/null and b/src/img/icon-144-android.png differ
diff --git a/src/img/icon-144-ios.png b/src/img/icon-144-ios.png
new file mode 100644
index 0000000..a2134e9
Binary files /dev/null and b/src/img/icon-144-ios.png differ
diff --git a/src/img/icon-180-ios.png b/src/img/icon-180-ios.png
new file mode 100644
index 0000000..68da8e7
Binary files /dev/null and b/src/img/icon-180-ios.png differ
diff --git a/src/img/icon-192-android.png b/src/img/icon-192-android.png
new file mode 100644
index 0000000..06cdff2
Binary files /dev/null and b/src/img/icon-192-android.png differ
diff --git a/src/img/icon-196.png b/src/img/icon-196-universal.png
similarity index 100%
rename from src/img/icon-196.png
rename to src/img/icon-196-universal.png
diff --git a/src/img/icon-29-ios.png b/src/img/icon-29-ios.png
new file mode 100644
index 0000000..583dd7c
Binary files /dev/null and b/src/img/icon-29-ios.png differ
diff --git a/src/img/icon-36-android.png b/src/img/icon-36-android.png
new file mode 100644
index 0000000..3cc8b4b
Binary files /dev/null and b/src/img/icon-36-android.png differ
diff --git a/src/img/icon-40-ios.png b/src/img/icon-40-ios.png
new file mode 100644
index 0000000..ea728f2
Binary files /dev/null and b/src/img/icon-40-ios.png differ
diff --git a/src/img/icon-48-android.png b/src/img/icon-48-android.png
new file mode 100644
index 0000000..9e4447e
Binary files /dev/null and b/src/img/icon-48-android.png differ
diff --git a/src/img/icon-50-ios.png b/src/img/icon-50-ios.png
new file mode 100644
index 0000000..e94bcbe
Binary files /dev/null and b/src/img/icon-50-ios.png differ
diff --git a/src/img/icon-57-ios.png b/src/img/icon-57-ios.png
new file mode 100644
index 0000000..b237dca
Binary files /dev/null and b/src/img/icon-57-ios.png differ
diff --git a/src/img/icon-58-ios.png b/src/img/icon-58-ios.png
new file mode 100644
index 0000000..4436f37
Binary files /dev/null and b/src/img/icon-58-ios.png differ
diff --git a/src/img/icon-60-android.png b/src/img/icon-60-android.png
new file mode 100644
index 0000000..0cfec38
Binary files /dev/null and b/src/img/icon-60-android.png differ
diff --git a/src/img/icon-60-ios.png b/src/img/icon-60-ios.png
new file mode 100644
index 0000000..1a191b2
Binary files /dev/null and b/src/img/icon-60-ios.png differ
diff --git a/src/img/icon-72-android.png b/src/img/icon-72-android.png
new file mode 100644
index 0000000..afc8364
Binary files /dev/null and b/src/img/icon-72-android.png differ
diff --git a/src/img/icon-72-ios.png b/src/img/icon-72-ios.png
new file mode 100644
index 0000000..da28ac3
Binary files /dev/null and b/src/img/icon-72-ios.png differ
diff --git a/src/img/icon-76-ios.png b/src/img/icon-76-ios.png
new file mode 100644
index 0000000..f068977
Binary files /dev/null and b/src/img/icon-76-ios.png differ
diff --git a/src/img/icon-78-android.png b/src/img/icon-78-android.png
new file mode 100644
index 0000000..025bc1a
Binary files /dev/null and b/src/img/icon-78-android.png differ
diff --git a/src/img/icon-80-ios.png b/src/img/icon-80-ios.png
new file mode 100644
index 0000000..5ccbcb0
Binary files /dev/null and b/src/img/icon-80-ios.png differ
diff --git a/src/img/icon-87-ios.png b/src/img/icon-87-ios.png
new file mode 100644
index 0000000..f0a698c
Binary files /dev/null and b/src/img/icon-87-ios.png differ
diff --git a/src/img/icon-96-android.png b/src/img/icon-96-android.png
new file mode 100644
index 0000000..9fe255e
Binary files /dev/null and b/src/img/icon-96-android.png differ
diff --git a/src/index.html b/src/index.html
index 4d50df6..d381431 100644
--- a/src/index.html
+++ b/src/index.html
@@ -18,7 +18,7 @@
     <!-- standard homescreen link -->
     <meta name="mobile-web-app-capable" content="yes">
     <!-- standard icon (retina) -->
-    <link rel="icon" sizes="196x196" href="img/icon-196.png">
+    <link rel="icon" sizes="196x196" href="img/icon-196-universal.png">
 
     <!-- Viewport and styles -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
diff --git a/src/manifest.json b/src/manifest.json
index 6620aa6..9a043a1 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -5,10 +5,8 @@
   "manifest_version": 2,
   "offline_enabled": true,
   "icons": {
-    "120": "img/icon-120-ios.png",
-    "152": "img/icon-152-ios.png",
     "128": "img/icon-128-chrome.png",
-    "196": "img/icon-196.png"
+    "196": "img/icon-196-universal.png"
   },
   "permissions": [
     "unlimitedStorage",
diff --git a/src/manifest.mobile.json b/src/manifest.mobile.json
index d6789fc..7f8887a 100644
--- a/src/manifest.mobile.json
+++ b/src/manifest.mobile.json
@@ -1,13 +1,42 @@
 {
     "packageId": "io.whiteout.WhiteoutMail",
     "versionCode": 12,
-    "CFBundleVersion": "1.1.1",
+    "CFBundleVersion": "1",
 
     "ios": {
         "oauth2": {
             "client_id": "440907777130-m0cn01eot554ik1h70hfcmvidnq61oer.apps.googleusercontent.com"
-        }
+        },
+        "icons": {
+            "29": "img/icon-29-ios.png",
+            "40": "img/icon-40-ios.png",
+            "50": "img/icon-50-ios.png",
+            "57": "img/icon-57-ios.png",
+            "58": "img/icon-58-ios.png",
+            "60": "img/icon-60-ios.png",
+            "72": "img/icon-72-ios.png",
+            "76": "img/icon-76-ios.png",
+            "80": "img/icon-80-ios.png",
+            "87": "img/icon-87-ios.png",
+            "100": "img/icon-100-ios.png",
+            "114": "img/icon-114-ios.png",
+            "120": "img/icon-120-ios.png",
+            "144": "img/icon-144-ios.png",
+            "152": "img/icon-152-ios.png",
+            "180": "img/icon-180-ios.png"
+        },
     },
 
-    "android": {}
+    "android": {
+        "icons": {
+            "36": "img/icon-36-android.png",
+            "48": "img/icon-48-android.png",
+            "60": "img/icon-60-android.png",
+            "72": "img/icon-72-android.png",
+            "78": "img/icon-78-android.png",
+            "96": "img/icon-96-android.png",
+            "144": "img/icon-144-android.png",
+            "192": "img/icon-192-android.png"
+        },
+    }
 }
\ No newline at end of file