diff --git a/web/static/config/manifest.json b/web/static/config/manifest.json
index 8f29460b3b..dd95d917e4 100644
--- a/web/static/config/manifest.json
+++ b/web/static/config/manifest.json
@@ -1,13 +1,40 @@
 {
-  "name": "Mattermost",
-  "icons": [
-    {
-      "src": "../static/iamges/icon50x50.png",
-      "sizes": "50x50",
-      "type": "image/png"
-    }
-  ],
-  "start_url": "/",
-  "display": "standalone",
-  "orientation": "portrait"
+    "name": "Mattermost",
+    "icons": [{
+        "src": "/static/images/favicon/android-chrome-36x36.png",
+        "type": "image/png",
+        "sizes": "36x36"
+    }, {
+        "src": "/static/images/favicon/android-chrome-48x48.png",
+        "type": "image/png",
+        "sizes": "48x48"
+    }, {
+        "src": "/static/images/favicon/android-chrome-72x72.png",
+        "type": "image/png",
+        "sizes": "72x72"
+    }, {
+        "src": "/static/images/favicon/android-chrome-96x96.png",
+        "type": "image/png",
+        "sizes": "96x96"
+    }, {
+        "src": "/static/images/favicon/android-chrome-144x144.png",
+        "type": "image/png",
+        "sizes": "144x144"
+    }, {
+        "src": "/static/images/favicon/android-chrome-192x192.png",
+        "type": "image/png",
+        "sizes": "192x192"
+    }, {
+        "src": "/static/images/favicon/android-chrome-256x256.png",
+        "type": "image/png",
+        "sizes": "256x256"
+    }, {
+        "src": "/static/images/favicon/android-chrome-384x384.png",
+        "type": "image/png",
+        "sizes": "384x384"
+    }, {
+        "src": "/static/images/favicon/android-chrome-512x512.png",
+        "type": "image/png",
+        "sizes": "512x512"
+    }]
 }
\ No newline at end of file
diff --git a/web/static/images/favicon/android-chrome-144x144.png b/web/static/images/favicon/android-chrome-144x144.png
new file mode 100644
index 0000000000..4a22e3534b
Binary files /dev/null and b/web/static/images/favicon/android-chrome-144x144.png differ
diff --git a/web/static/images/favicon/android-chrome-192x192.png b/web/static/images/favicon/android-chrome-192x192.png
new file mode 100644
index 0000000000..70ed0f6abe
Binary files /dev/null and b/web/static/images/favicon/android-chrome-192x192.png differ
diff --git a/web/static/images/favicon/android-chrome-256x256.png b/web/static/images/favicon/android-chrome-256x256.png
new file mode 100644
index 0000000000..a887fbb362
Binary files /dev/null and b/web/static/images/favicon/android-chrome-256x256.png differ
diff --git a/web/static/images/favicon/android-chrome-36x36.png b/web/static/images/favicon/android-chrome-36x36.png
new file mode 100644
index 0000000000..7ee0bdb1ad
Binary files /dev/null and b/web/static/images/favicon/android-chrome-36x36.png differ
diff --git a/web/static/images/favicon/android-chrome-384x384.png b/web/static/images/favicon/android-chrome-384x384.png
new file mode 100644
index 0000000000..5ddc086f28
Binary files /dev/null and b/web/static/images/favicon/android-chrome-384x384.png differ
diff --git a/web/static/images/favicon/android-chrome-48x48.png b/web/static/images/favicon/android-chrome-48x48.png
new file mode 100644
index 0000000000..c247ca648b
Binary files /dev/null and b/web/static/images/favicon/android-chrome-48x48.png differ
diff --git a/web/static/images/favicon/android-chrome-512x512.png b/web/static/images/favicon/android-chrome-512x512.png
new file mode 100644
index 0000000000..feef173e8a
Binary files /dev/null and b/web/static/images/favicon/android-chrome-512x512.png differ
diff --git a/web/static/images/favicon/android-chrome-72x72.png b/web/static/images/favicon/android-chrome-72x72.png
new file mode 100644
index 0000000000..d1c034c2ca
Binary files /dev/null and b/web/static/images/favicon/android-chrome-72x72.png differ
diff --git a/web/static/images/favicon/android-chrome-96x96.png b/web/static/images/favicon/android-chrome-96x96.png
new file mode 100644
index 0000000000..6f89e95550
Binary files /dev/null and b/web/static/images/favicon/android-chrome-96x96.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-114x114.png b/web/static/images/favicon/apple-touch-icon-114x114.png
new file mode 100644
index 0000000000..dd9d5f8b54
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-114x114.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-120x120.png b/web/static/images/favicon/apple-touch-icon-120x120.png
new file mode 100644
index 0000000000..6c4722bda9
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-120x120.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-144x144.png b/web/static/images/favicon/apple-touch-icon-144x144.png
new file mode 100644
index 0000000000..b0f5f7ffce
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-144x144.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-152x152.png b/web/static/images/favicon/apple-touch-icon-152x152.png
new file mode 100644
index 0000000000..c21ff7e222
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-152x152.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-180x180.png b/web/static/images/favicon/apple-touch-icon-180x180.png
new file mode 100644
index 0000000000..76839d390d
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-180x180.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-57x57.png b/web/static/images/favicon/apple-touch-icon-57x57.png
new file mode 100644
index 0000000000..43496f1f76
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-57x57.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-60x60.png b/web/static/images/favicon/apple-touch-icon-60x60.png
new file mode 100644
index 0000000000..4c9813d0c6
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-60x60.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-72x72.png b/web/static/images/favicon/apple-touch-icon-72x72.png
new file mode 100644
index 0000000000..bc04608bff
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-72x72.png differ
diff --git a/web/static/images/favicon/apple-touch-icon-76x76.png b/web/static/images/favicon/apple-touch-icon-76x76.png
new file mode 100644
index 0000000000..172791cbc8
Binary files /dev/null and b/web/static/images/favicon/apple-touch-icon-76x76.png differ
diff --git a/web/static/images/favicon.ico b/web/static/images/favicon/favicon-16x16.png
similarity index 76%
rename from web/static/images/favicon.ico
rename to web/static/images/favicon/favicon-16x16.png
index af55053316..777a605461 100644
Binary files a/web/static/images/favicon.ico and b/web/static/images/favicon/favicon-16x16.png differ
diff --git a/web/static/images/favicon/favicon-32x32.png b/web/static/images/favicon/favicon-32x32.png
new file mode 100644
index 0000000000..36c4a12e03
Binary files /dev/null and b/web/static/images/favicon/favicon-32x32.png differ
diff --git a/web/static/images/favicon/favicon-96x96.png b/web/static/images/favicon/favicon-96x96.png
new file mode 100644
index 0000000000..4f6c6d1b29
Binary files /dev/null and b/web/static/images/favicon/favicon-96x96.png differ
diff --git a/web/static/images/icon50x50.png b/web/static/images/icon50x50.png
index 7ac6ce1c97..4791e755fe 100644
Binary files a/web/static/images/icon50x50.png and b/web/static/images/icon50x50.png differ
diff --git a/web/static/images/logo-email.png b/web/static/images/logo-email.png
index c16978ba89..d0a38e21de 100644
Binary files a/web/static/images/logo-email.png and b/web/static/images/logo-email.png differ
diff --git a/web/static/images/logo.png b/web/static/images/logo.png
index 423d4d2704..1a35cdf019 100644
Binary files a/web/static/images/logo.png and b/web/static/images/logo.png differ
diff --git a/web/static/images/logoWhite.png b/web/static/images/logoWhite.png
index 11bbd46322..3166c974c5 100644
Binary files a/web/static/images/logoWhite.png and b/web/static/images/logoWhite.png differ
diff --git a/web/static/images/logo_compact.png b/web/static/images/logo_compact.png
index b861b7c6da..a4bce62818 100644
Binary files a/web/static/images/logo_compact.png and b/web/static/images/logo_compact.png differ
diff --git a/web/templates/head.html b/web/templates/head.html
index 689c69d3ca..b5eb3a9b36 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -15,6 +15,19 @@
     <!-- iOS add to homescreen -->
 
     <!-- Android add to homescreen -->
+    <link rel="apple-touch-icon" sizes="57x57" href="/static/images/favicon/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/static/images/favicon/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/static/images/favicon/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/static/images/favicon/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/static/images/favicon/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/static/images/favicon/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/static/images/favicon/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/static/images/favicon/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/static/images/favicon/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/images/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="/static/images/favicon/android-chrome-192x192.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/static/images/favicon/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/images/favicon/favicon-16x16.png">
     <link rel="manifest" href="/static/config/manifest.json">
     <!-- Android add to homescreen -->
 
@@ -27,9 +40,6 @@
     <link rel="stylesheet" href="/static/css/katex.min.css">
     <link rel="stylesheet" class="code_theme" href="">
 
-    <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon">
-    <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon">
-
     <script src="/static/js/react-0.14.3.js"></script>
     <script src="/static/js/react-dom-0.14.3.js"></script>
     <script src="/static/js/jquery-2.1.4.js"></script>