diff --git a/Ombi.Api/SonarrApi.cs b/Ombi.Api/SonarrApi.cs
index 2485150b8..3cf8565e8 100644
--- a/Ombi.Api/SonarrApi.cs
+++ b/Ombi.Api/SonarrApi.cs
@@ -52,9 +52,9 @@ namespace Ombi.Api
 
             request.AddHeader("X-Api-Key", apiKey);
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetProfiles for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
-                TimeSpan.FromSeconds (2),
-                TimeSpan.FromSeconds(5),
-                TimeSpan.FromSeconds(10)
+                TimeSpan.FromSeconds (1),
+                TimeSpan.FromSeconds(2),
+                TimeSpan.FromSeconds(5)
             });
 
             var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrProfile>>(request, baseUrl));
@@ -68,9 +68,9 @@ namespace Ombi.Api
 
             request.AddHeader("X-Api-Key", apiKey);
             var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetRootFolders for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
-                  TimeSpan.FromSeconds (2),
-                  TimeSpan.FromSeconds(5),
-                  TimeSpan.FromSeconds(10)
+                  TimeSpan.FromSeconds (1),
+                  TimeSpan.FromSeconds(2),
+                  TimeSpan.FromSeconds(5)
               });
 
             var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrRootFolder>>(request, baseUrl));
diff --git a/Ombi.UI/Content/favicon/android-icon-144x144.png b/Ombi.UI/Content/favicon/android-icon-144x144.png
new file mode 100644
index 000000000..8dec0f53f
Binary files /dev/null and b/Ombi.UI/Content/favicon/android-icon-144x144.png differ
diff --git a/Ombi.UI/Content/favicon/android-icon-192x192.png b/Ombi.UI/Content/favicon/android-icon-192x192.png
new file mode 100644
index 000000000..8c15a40e8
Binary files /dev/null and b/Ombi.UI/Content/favicon/android-icon-192x192.png differ
diff --git a/Ombi.UI/Content/favicon/android-icon-36x36.png b/Ombi.UI/Content/favicon/android-icon-36x36.png
new file mode 100644
index 000000000..d7257ed88
Binary files /dev/null and b/Ombi.UI/Content/favicon/android-icon-36x36.png differ
diff --git a/Ombi.UI/Content/favicon/android-icon-48x48.png b/Ombi.UI/Content/favicon/android-icon-48x48.png
new file mode 100644
index 000000000..679a62be7
Binary files /dev/null and b/Ombi.UI/Content/favicon/android-icon-48x48.png differ
diff --git a/Ombi.UI/Content/favicon/android-icon-72x72.png b/Ombi.UI/Content/favicon/android-icon-72x72.png
new file mode 100644
index 000000000..a1f6eaee9
Binary files /dev/null and b/Ombi.UI/Content/favicon/android-icon-72x72.png differ
diff --git a/Ombi.UI/Content/favicon/android-icon-96x96.png b/Ombi.UI/Content/favicon/android-icon-96x96.png
new file mode 100644
index 000000000..25b5c9881
Binary files /dev/null and b/Ombi.UI/Content/favicon/android-icon-96x96.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-114x114.png b/Ombi.UI/Content/favicon/apple-icon-114x114.png
new file mode 100644
index 000000000..363b80390
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-114x114.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-120x120.png b/Ombi.UI/Content/favicon/apple-icon-120x120.png
new file mode 100644
index 000000000..fc919bcad
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-120x120.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-144x144.png b/Ombi.UI/Content/favicon/apple-icon-144x144.png
new file mode 100644
index 000000000..8dec0f53f
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-144x144.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-152x152.png b/Ombi.UI/Content/favicon/apple-icon-152x152.png
new file mode 100644
index 000000000..ff85e4ae5
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-152x152.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-180x180.png b/Ombi.UI/Content/favicon/apple-icon-180x180.png
new file mode 100644
index 000000000..ef1ae9b40
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-180x180.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-57x57.png b/Ombi.UI/Content/favicon/apple-icon-57x57.png
new file mode 100644
index 000000000..02ab29ef5
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-57x57.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-60x60.png b/Ombi.UI/Content/favicon/apple-icon-60x60.png
new file mode 100644
index 000000000..1d33e7efc
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-60x60.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-72x72.png b/Ombi.UI/Content/favicon/apple-icon-72x72.png
new file mode 100644
index 000000000..a1f6eaee9
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-72x72.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-76x76.png b/Ombi.UI/Content/favicon/apple-icon-76x76.png
new file mode 100644
index 000000000..754a6cc41
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-76x76.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon-precomposed.png b/Ombi.UI/Content/favicon/apple-icon-precomposed.png
new file mode 100644
index 000000000..aa396ceb9
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon-precomposed.png differ
diff --git a/Ombi.UI/Content/favicon/apple-icon.png b/Ombi.UI/Content/favicon/apple-icon.png
new file mode 100644
index 000000000..aa396ceb9
Binary files /dev/null and b/Ombi.UI/Content/favicon/apple-icon.png differ
diff --git a/Ombi.UI/Content/favicon/browserconfig.xml b/Ombi.UI/Content/favicon/browserconfig.xml
new file mode 100644
index 000000000..c55414822
--- /dev/null
+++ b/Ombi.UI/Content/favicon/browserconfig.xml
@@ -0,0 +1,2 @@
+<?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
diff --git a/Ombi.UI/Content/favicon/favicon-16x16.png b/Ombi.UI/Content/favicon/favicon-16x16.png
new file mode 100644
index 000000000..5f598fef8
Binary files /dev/null and b/Ombi.UI/Content/favicon/favicon-16x16.png differ
diff --git a/Ombi.UI/Content/favicon/favicon-32x32.png b/Ombi.UI/Content/favicon/favicon-32x32.png
new file mode 100644
index 000000000..5fb52fea2
Binary files /dev/null and b/Ombi.UI/Content/favicon/favicon-32x32.png differ
diff --git a/Ombi.UI/Content/favicon/favicon-96x96.png b/Ombi.UI/Content/favicon/favicon-96x96.png
new file mode 100644
index 000000000..25b5c9881
Binary files /dev/null and b/Ombi.UI/Content/favicon/favicon-96x96.png differ
diff --git a/Ombi.UI/Content/favicon/favicon.ico b/Ombi.UI/Content/favicon/favicon.ico
new file mode 100644
index 000000000..6d7b96d57
Binary files /dev/null and b/Ombi.UI/Content/favicon/favicon.ico differ
diff --git a/Ombi.UI/Content/favicon/manifest.json b/Ombi.UI/Content/favicon/manifest.json
new file mode 100644
index 000000000..013d4a6a5
--- /dev/null
+++ b/Ombi.UI/Content/favicon/manifest.json
@@ -0,0 +1,41 @@
+{
+ "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/Ombi.UI/Content/favicon/ms-icon-144x144.png b/Ombi.UI/Content/favicon/ms-icon-144x144.png
new file mode 100644
index 000000000..8dec0f53f
Binary files /dev/null and b/Ombi.UI/Content/favicon/ms-icon-144x144.png differ
diff --git a/Ombi.UI/Content/favicon/ms-icon-150x150.png b/Ombi.UI/Content/favicon/ms-icon-150x150.png
new file mode 100644
index 000000000..b3d716bc6
Binary files /dev/null and b/Ombi.UI/Content/favicon/ms-icon-150x150.png differ
diff --git a/Ombi.UI/Content/favicon/ms-icon-310x310.png b/Ombi.UI/Content/favicon/ms-icon-310x310.png
new file mode 100644
index 000000000..23e860a6f
Binary files /dev/null and b/Ombi.UI/Content/favicon/ms-icon-310x310.png differ
diff --git a/Ombi.UI/Content/favicon/ms-icon-70x70.png b/Ombi.UI/Content/favicon/ms-icon-70x70.png
new file mode 100644
index 000000000..4e50f9a24
Binary files /dev/null and b/Ombi.UI/Content/favicon/ms-icon-70x70.png differ
diff --git a/Ombi.UI/Helpers/BaseUrlHelper.cs b/Ombi.UI/Helpers/BaseUrlHelper.cs
index 99c37459e..3a153493d 100644
--- a/Ombi.UI/Helpers/BaseUrlHelper.cs
+++ b/Ombi.UI/Helpers/BaseUrlHelper.cs
@@ -283,11 +283,30 @@ namespace Ombi.UI.Helpers
 
             var assetLocation = GetBaseUrl();
             var content = GetContentUrl(assetLocation);
+            var sb = new StringBuilder();
 
-            var asset = $"<link rel=\"SHORTCUT ICON\" href=\"{content}/Content/favicon.ico\" />";
-            asset += $"<link rel=\"icon\" href=\"{content}/Content/favicon.ico\" type=\"image/ico\" />";
+            sb.Append($"<link rel=\"SHORTCUT ICON\" href=\"{content}/Content/favicon/favicon.ico\" />");
+            sb.Append($"<link rel=\"icon\" href=\"{content}/Content/favicon/favicon.ico\" type=\"image/ico\" />");
+
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"57x57\" href=\"{content}/Content/favicon/apple-icon-57x57.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"60x60\" href=\"{content}/Content/favicon/apple-icon-60x60.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\"{content}/Content/favicon/apple-icon-72x72.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"76x76\" href=\"{content}/Content/favicon/apple-icon-76x76.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"114x114\" href=\"{content}/Content/favicon/apple-icon-114x114.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"120x120\" href=\"{content}/Content/favicon/apple-icon-120x120.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"144x144\" href=\"{content}/Content/favicon/apple-icon-144x144.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"152x152\" href=\"{content}/Content/favicon/apple-icon-152x152.png\">");
+            sb.Append($"<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"{content}/Content/favicon/apple-icon-180x180.png\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"192x192\"  href=\"{content}/Content/favicon/android-icon-192x192.png\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"{content}/Content/favicon/favicon-32x32.png\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"96x96\" href=\"{content}/Content/favicon/favicon-96x96.png\">");
+            sb.Append($"<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"{content}/Content/favicon/favicon-16x16.png\">");
+            sb.Append($"<link rel=\"manifest\" href=\"{content}/Content/favicon/manifest.json\">");
+            sb.Append($"<meta name=\"msapplication-TileColor\" content=\"#ffffff\">");
+            sb.Append($"<meta name=\"msapplication-TileImage\" content=\"{content}/Content/favicon/ms-icon-144x144.png\">");
+            sb.Append($"<meta name=\"theme-color\" content=\"#ffffff\">");
 
-            return helper.Raw(asset);
+            return helper.Raw(sb.ToString());
         }
 
         public static IHtmlString GetSidebarUrl(this HtmlHelpers helper, NancyContext context, string url, string title, string icon = null)
diff --git a/Ombi.UI/Ombi.UI.csproj b/Ombi.UI/Ombi.UI.csproj
index eebd32612..09f259740 100644
--- a/Ombi.UI/Ombi.UI.csproj
+++ b/Ombi.UI/Ombi.UI.csproj
@@ -390,6 +390,84 @@
       <DependentUpon>datepicker.css</DependentUpon>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\favicon\android-icon-144x144.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-192x192.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-36x36.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-48x48.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-72x72.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\android-icon-96x96.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-114x114.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-120x120.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-144x144.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-152x152.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-180x180.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-57x57.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-60x60.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-72x72.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-76x76.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon-precomposed.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\apple-icon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\browserconfig.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon-16x16.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon-32x32.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon-96x96.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\favicon.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-144x144.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-150x150.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-310x310.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\favicon\ms-icon-70x70.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\helpers\bootbox.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -639,6 +717,9 @@
     </None>
     <None Include="Content\base.scss" />
     <None Include="Content\bootstrap-datetimepicker-build.less" />
+    <None Include="Content\favicon\manifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Themes\original.scss" />
     <None Include="Content\Themes\plex.scss" />
     <Content Include="Content\pace.min.js">