diff --git a/src/Ombi/Views/Shared/_Layout.cshtml b/src/Ombi/Views/Shared/_Layout.cshtml
index 8d015de08..104481024 100644
--- a/src/Ombi/Views/Shared/_Layout.cshtml
+++ b/src/Ombi/Views/Shared/_Layout.cshtml
@@ -64,26 +64,16 @@ O:::::::OOO:::::::Om::::m   m::::m   m::::mb:::::bbbbbb::::::bi::::::i
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>@appName</title>
     <base href="/@baseUrl"/>
-    <link rel="SHORTCUT ICON" href="~/images/favicon/favicon.ico"/>
-    <link rel="icon" href="~/images/favicon/favicon.ico" type="image/ico"/>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="~/images/favicon/apple-icon-57x57.png"/>
-    <link rel="apple-touch-icon" sizes="60x60" href="~/images/favicon/apple-icon-60x60.png"/>
-    <link rel="apple-touch-icon" sizes="72x72" href="~/images/favicon/apple-icon-72x72.png"/>
-    <link rel="apple-touch-icon" sizes="76x76" href="~/images/favicon/apple-icon-76x76.png"/>
-    <link rel="apple-touch-icon" sizes="114x114" href="~/images/favicon/apple-icon-114x114.png"/>
-    <link rel="apple-touch-icon" sizes="120x120" href="~/images/favicon/apple-icon-120x120.png"/>
-    <link rel="apple-touch-icon" sizes="144x144" href="~/images/favicon/apple-icon-144x144.png"/>
-    <link rel="apple-touch-icon" sizes="152x152" href="~/images/favicon/apple-icon-152x152.png"/>
-    <link rel="apple-touch-icon" sizes="180x180" href="~/images/favicon/apple-icon-180x180.png"/>
-    <link rel="icon" type="image/png" sizes="192x192" href="~/images/favicon/android-icon-192x192.png"/>
-    <link rel="icon" type="image/png" sizes="32x32" href="~/images/favicon/favicon-32x32.png"/>
-    <link rel="icon" type="image/png" sizes="96x96" href="~/images/favicon/favicon-96x96.png"/>
-    <link rel="icon" type="image/png" sizes="16x16" href="~/images/favicon/favicon-16x16.png"/>
-    <link rel="manifest" href="~/images/favicon/manifest.json">
-    <meta name="msapplication-TileColor" content="#ffffff"/>
-    <meta name="msapplication-TileImage" content="~/images/favicon/ms-icon-144x144.png"/>
-    <meta name="theme-color" content="#ffffff"/>
+    <link rel="apple-touch-icon" sizes="180x180" href="~/images/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="~/images/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="~/images/favicon/favicon-16x16.png">
+    <link rel="manifest" href="~/images/favicon/site.webmanifest">
+    <link rel="mask-icon" href="~/images/favicon/safari-pinned-tab.svg" color="#df691a">
+    <link rel="shortcut icon" href="~/images/favicon/favicon.ico">
+    <meta name="msapplication-TileColor" content="#df691a">
+    <meta name="msapplication-config" content="~/images/favicon/browserconfig.xml">
+    <meta name="theme-color" content="#df691a">
 
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
diff --git a/src/Ombi/wwwroot/images/favicon/android-chrome-192x192.png b/src/Ombi/wwwroot/images/favicon/android-chrome-192x192.png
new file mode 100644
index 000000000..5fbcf9cf1
Binary files /dev/null and b/src/Ombi/wwwroot/images/favicon/android-chrome-192x192.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-chrome-512x512.png b/src/Ombi/wwwroot/images/favicon/android-chrome-512x512.png
new file mode 100644
index 000000000..8094bfdda
Binary files /dev/null and b/src/Ombi/wwwroot/images/favicon/android-chrome-512x512.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-144x144.png b/src/Ombi/wwwroot/images/favicon/android-icon-144x144.png
deleted file mode 100644
index cfe4f838f..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-144x144.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-192x192.png b/src/Ombi/wwwroot/images/favicon/android-icon-192x192.png
deleted file mode 100644
index 66834b472..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-192x192.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-36x36.png b/src/Ombi/wwwroot/images/favicon/android-icon-36x36.png
deleted file mode 100644
index 215339d90..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-36x36.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-48x48.png b/src/Ombi/wwwroot/images/favicon/android-icon-48x48.png
deleted file mode 100644
index 9d425f81f..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-48x48.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-72x72.png b/src/Ombi/wwwroot/images/favicon/android-icon-72x72.png
deleted file mode 100644
index 3876d051a..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-72x72.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-96x96.png b/src/Ombi/wwwroot/images/favicon/android-icon-96x96.png
deleted file mode 100644
index c8e26d722..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-96x96.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-114x114.png b/src/Ombi/wwwroot/images/favicon/apple-icon-114x114.png
deleted file mode 100644
index a8fa6f81f..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-114x114.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-120x120.png b/src/Ombi/wwwroot/images/favicon/apple-icon-120x120.png
deleted file mode 100644
index 5ea108611..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-120x120.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-144x144.png b/src/Ombi/wwwroot/images/favicon/apple-icon-144x144.png
deleted file mode 100644
index cfe4f838f..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-144x144.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-152x152.png b/src/Ombi/wwwroot/images/favicon/apple-icon-152x152.png
deleted file mode 100644
index df70d578e..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-152x152.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-180x180.png b/src/Ombi/wwwroot/images/favicon/apple-icon-180x180.png
deleted file mode 100644
index a917d113c..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-180x180.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-57x57.png b/src/Ombi/wwwroot/images/favicon/apple-icon-57x57.png
deleted file mode 100644
index cb852ffd9..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-57x57.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-60x60.png b/src/Ombi/wwwroot/images/favicon/apple-icon-60x60.png
deleted file mode 100644
index 7aeeb1243..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-60x60.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-72x72.png b/src/Ombi/wwwroot/images/favicon/apple-icon-72x72.png
deleted file mode 100644
index 3876d051a..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-72x72.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-76x76.png b/src/Ombi/wwwroot/images/favicon/apple-icon-76x76.png
deleted file mode 100644
index 32826bd09..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-76x76.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-precomposed.png b/src/Ombi/wwwroot/images/favicon/apple-icon-precomposed.png
deleted file mode 100644
index 7fb80052d..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-precomposed.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon.png b/src/Ombi/wwwroot/images/favicon/apple-icon.png
deleted file mode 100644
index 7fb80052d..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-touch-icon.png b/src/Ombi/wwwroot/images/favicon/apple-touch-icon.png
new file mode 100644
index 000000000..1e6943041
Binary files /dev/null and b/src/Ombi/wwwroot/images/favicon/apple-touch-icon.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/browserconfig.xml b/src/Ombi/wwwroot/images/favicon/browserconfig.xml
index c55414822..bc29df9e6 100644
--- a/src/Ombi/wwwroot/images/favicon/browserconfig.xml
+++ b/src/Ombi/wwwroot/images/favicon/browserconfig.xml
@@ -1,2 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/images/favicon/mstile-150x150.png"/>
+            <TileColor>#df691a</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/src/Ombi/wwwroot/images/favicon/favicon-16x16.png b/src/Ombi/wwwroot/images/favicon/favicon-16x16.png
index 7dfea78a5..e8d2f0201 100644
Binary files a/src/Ombi/wwwroot/images/favicon/favicon-16x16.png and b/src/Ombi/wwwroot/images/favicon/favicon-16x16.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/favicon-32x32.png b/src/Ombi/wwwroot/images/favicon/favicon-32x32.png
index c3853b662..93c92c69a 100644
Binary files a/src/Ombi/wwwroot/images/favicon/favicon-32x32.png and b/src/Ombi/wwwroot/images/favicon/favicon-32x32.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/favicon-96x96.png b/src/Ombi/wwwroot/images/favicon/favicon-96x96.png
deleted file mode 100644
index c8e26d722..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/favicon-96x96.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/favicon.ico b/src/Ombi/wwwroot/images/favicon/favicon.ico
index 62b406080..106450c2e 100644
Binary files a/src/Ombi/wwwroot/images/favicon/favicon.ico and b/src/Ombi/wwwroot/images/favicon/favicon.ico differ
diff --git a/src/Ombi/wwwroot/images/favicon/manifest.json b/src/Ombi/wwwroot/images/favicon/manifest.json
deleted file mode 100644
index 013d4a6a5..000000000
--- a/src/Ombi/wwwroot/images/favicon/manifest.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "App",
- "icons": [
-  {
-   "src": "\/android-icon-36x36.png",
-   "sizes": "36x36",
-   "type": "image\/png",
-   "density": "0.75"
-  },
-  {
-   "src": "\/android-icon-48x48.png",
-   "sizes": "48x48",
-   "type": "image\/png",
-   "density": "1.0"
-  },
-  {
-   "src": "\/android-icon-72x72.png",
-   "sizes": "72x72",
-   "type": "image\/png",
-   "density": "1.5"
-  },
-  {
-   "src": "\/android-icon-96x96.png",
-   "sizes": "96x96",
-   "type": "image\/png",
-   "density": "2.0"
-  },
-  {
-   "src": "\/android-icon-144x144.png",
-   "sizes": "144x144",
-   "type": "image\/png",
-   "density": "3.0"
-  },
-  {
-   "src": "\/android-icon-192x192.png",
-   "sizes": "192x192",
-   "type": "image\/png",
-   "density": "4.0"
-  }
- ]
-}
\ No newline at end of file
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-144x144.png b/src/Ombi/wwwroot/images/favicon/ms-icon-144x144.png
deleted file mode 100644
index cfe4f838f..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-144x144.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-150x150.png b/src/Ombi/wwwroot/images/favicon/ms-icon-150x150.png
deleted file mode 100644
index 7664f1729..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-150x150.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-310x310.png b/src/Ombi/wwwroot/images/favicon/ms-icon-310x310.png
deleted file mode 100644
index fc6ffd626..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-310x310.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-70x70.png b/src/Ombi/wwwroot/images/favicon/ms-icon-70x70.png
deleted file mode 100644
index 78e6bb882..000000000
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-70x70.png and /dev/null differ
diff --git a/src/Ombi/wwwroot/images/favicon/mstile-150x150.png b/src/Ombi/wwwroot/images/favicon/mstile-150x150.png
new file mode 100644
index 000000000..d4f00545e
Binary files /dev/null and b/src/Ombi/wwwroot/images/favicon/mstile-150x150.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/safari-pinned-tab.svg b/src/Ombi/wwwroot/images/favicon/safari-pinned-tab.svg
new file mode 100644
index 000000000..450b8febf
--- /dev/null
+++ b/src/Ombi/wwwroot/images/favicon/safari-pinned-tab.svg
@@ -0,0 +1 @@
+<svg version="1" xmlns="http://www.w3.org/2000/svg" width="1365.333" height="1365.333" viewBox="0 0 1024.000000 1024.000000"><path d="M487.2 71c-140.4 9.8-263.6 80.9-341 196.7-39.5 59-63.1 124.3-71.8 198.8-2.5 21.1-2.5 71.9 0 93 6.5 56 19.9 101.7 43.7 150 21.9 44.5 48.5 81.2 85.3 118 47.8 47.7 105.8 83.8 168.9 105 160.4 53.9 335.7 13.4 454.3-105 36.8-36.8 63.4-73.5 85.3-118 23.8-48.3 37.2-94 43.7-150 2.5-21.1 2.5-71.9 0-93-5.2-44.4-15.1-83.6-30.9-122.2-32.3-78.8-88.7-148.4-159.2-196.6-61.7-42.1-130.7-67.4-205.5-75.2-17.9-1.9-56.3-2.7-72.8-1.5zM391 283c11.3 3.2 21.2 8.6 31.4 17.1 5 4.2 28.7 27.4 52.6 51.5 46.2 46.6 48 48.8 54.4 64.8 4.3 10.7 5.9 19.7 5.8 33.1 0 13.9-1.9 22.6-7.8 35.4l-3.7 8.2 3.8 3.9 3.8 3.9 4.6-2.3c19-9.6 43.2-12.1 63.1-6.6 9.7 2.7 22.1 8.7 29.6 14.4 3.2 2.4 27.1 25.7 52.9 51.8 41.7 42 47.5 48.2 51.4 55.1 8.8 15.7 12.8 32.1 11.7 48.7-.7 10.7-3.4 23-6.7 30.5-6.2 14.2-20 30.1-34.1 39.2-25.2 16.3-57.3 17.7-85.8 3.7l-11.5-5.7-50.1-50.1c-54.7-54.7-56.7-57.1-62.5-73.9-4-11.5-5.2-21.2-4.6-34.7.7-13.3 2.3-20.2 7.7-31.7l3.8-8.1-3.7-3.6-3.7-3.7-7.9 3.6c-27.5 12.6-61.6 10-86.2-6.5-6.6-4.5-98.4-96-103.9-103.7-10.6-14.6-15.7-31.5-15.7-51.3 0-14.6 1.6-22.4 7.3-34.6 12.5-27.1 34.7-44.6 63.5-50.3 8.4-1.7 31.9-.6 40.5 1.9zm179 66c1.9 1.9 2 3.3 2 35.2 0 32.7 0 33.2-2.2 35.5-3.1 3.3-7.7 3.1-11.1-.5l-2.7-2.8V384c0-31.9 0-32.4 2.2-34.7 2.8-3 8.9-3.2 11.8-.3zm74.1 30.9c5.6 5.6 5.3 6.1-20.3 31.8-25.6 25.6-26.9 26.5-31.9 21.7-2.1-2-2.9-3.7-2.9-6.3 0-3.4 1.5-5.1 22.3-25.7 12.2-12.2 23.1-22.7 24.2-23.3 3.3-1.7 5.5-1.3 8.6 1.8zm29.9 73.6c2.1 1.1 3.1 2.5 3.6 5.2.6 3.3.3 4-2.5 6.5L672 468h-64.4l-2.8-2.7c-3.6-3.4-3.7-7.5-.3-10.8l2.4-2.5H639c26.6 0 32.6.3 35 1.5z"/><path d="M358.4 324.5c-28.1 6.1-42.3 34.4-30.7 61 2.4 5.4 7.3 10.6 48.1 51.7 48.4 48.6 50 50 62.7 53.3 7.1 1.8 14.4 1.9 18 .3 2.5-1.1 2.3-1.4-20.8-24.7-21.3-21.5-23.5-24-24.6-28.3-3.3-13.7 6.7-26.8 20.6-26.8 2.9 0 7 .7 9.1 1.6 2.4.9 11.8 9.5 26.3 24l22.6 22.5 1.3-3.1c2.8-6.6-.7-22.3-6.9-31.6-2.3-3.4-22.5-24.3-47.8-49.4-47-46.8-48.3-47.8-61-50.5-8.1-1.7-9-1.7-16.9 0zM567.8 533.7c-1 .2-1.8.7-1.8 1.1 0 .3 13.2 13.9 29.4 30.2 28.2 28.2 29.5 29.7 31 35.1 2 6.8 1.1 12.1-3 18-2.9 4.2-8.8 8.2-13.8 9.3-1.5.4-5.4.2-8.5-.5l-5.6-1.1-30-29.9c-16.6-16.4-30.3-29.9-30.7-29.9-.3 0-1.1 1.9-1.7 4.3-1.9 7.6 1.2 20.8 6.9 29.7 4.2 6.4 90.5 92.1 96 95.2 16.7 9.5 36.8 7 51.4-6.3 13.7-12.5 17.2-33 8.5-50.8-2.8-6-7.6-11.1-48.8-52.2-48.8-48.7-49.3-49.1-61.9-51.8-5.2-1.1-14-1.3-17.4-.4z"/></svg>
\ No newline at end of file
diff --git a/src/Ombi/wwwroot/images/favicon/site.webmanifest b/src/Ombi/wwwroot/images/favicon/site.webmanifest
new file mode 100644
index 000000000..88b8f52fb
--- /dev/null
+++ b/src/Ombi/wwwroot/images/favicon/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "Ombi",
+    "short_name": "Ombi",
+    "icons": [
+        {
+            "src": "/images/favicon/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/images/favicon/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#df691a",
+    "background_color": "#df691a",
+    "display": "standalone"
+}