diff --git a/couchpotato/__init__.py b/couchpotato/__init__.py
index f6c4048..f4ec07b 100644
--- a/couchpotato/__init__.py
+++ b/couchpotato/__init__.py
@@ -77,8 +77,10 @@ def manifest(handler):
 
     lines = [
         'CACHE MANIFEST',
+        '# %s theme' % ('dark' if Env.setting('dark_theme') else 'light'),
         '',
-        'CACHE:'
+        'CACHE:',
+        ''
     ]
 
     if not Env.get('dev'):
diff --git a/couchpotato/static/images/favicon.ico b/couchpotato/static/images/favicon.ico
deleted file mode 100644
index f93f9fb..0000000
Binary files a/couchpotato/static/images/favicon.ico and /dev/null differ
diff --git a/couchpotato/static/images/homescreen.png b/couchpotato/static/images/homescreen.png
deleted file mode 100644
index 491be66..0000000
Binary files a/couchpotato/static/images/homescreen.png and /dev/null differ
diff --git a/couchpotato/static/images/icons/android.png b/couchpotato/static/images/icons/android.png
new file mode 100644
index 0000000..6aeb8f0
Binary files /dev/null and b/couchpotato/static/images/icons/android.png differ
diff --git a/couchpotato/static/images/icons/dark/android.png b/couchpotato/static/images/icons/dark/android.png
new file mode 100644
index 0000000..9efc63c
Binary files /dev/null and b/couchpotato/static/images/icons/dark/android.png differ
diff --git a/couchpotato/static/images/icons/dark/favicon.ico b/couchpotato/static/images/icons/dark/favicon.ico
new file mode 100644
index 0000000..7dc73e7
Binary files /dev/null and b/couchpotato/static/images/icons/dark/favicon.ico differ
diff --git a/couchpotato/static/images/icons/dark/ios.png b/couchpotato/static/images/icons/dark/ios.png
new file mode 100644
index 0000000..f0acf84
Binary files /dev/null and b/couchpotato/static/images/icons/dark/ios.png differ
diff --git a/couchpotato/static/images/icons/favicon.ico b/couchpotato/static/images/icons/favicon.ico
new file mode 100644
index 0000000..0342c6e
Binary files /dev/null and b/couchpotato/static/images/icons/favicon.ico differ
diff --git a/couchpotato/static/images/icons/ios.png b/couchpotato/static/images/icons/ios.png
new file mode 100644
index 0000000..dd694b3
Binary files /dev/null and b/couchpotato/static/images/icons/ios.png differ
diff --git a/couchpotato/static/images/icons/windows.png b/couchpotato/static/images/icons/windows.png
new file mode 100644
index 0000000..84bb3b9
Binary files /dev/null and b/couchpotato/static/images/icons/windows.png differ
diff --git a/couchpotato/static/scripts/combined.base.min.js b/couchpotato/static/scripts/combined.base.min.js
index 54d19f8..a529870 100644
--- a/couchpotato/static/scripts/combined.base.min.js
+++ b/couchpotato/static/scripts/combined.base.min.js
@@ -187,6 +187,17 @@ var CouchPotato = new Class({
         }
         window.addEvent("resize", self.resize.bind(self));
         self.resize();
+        self.checkCache();
+    },
+    checkCache: function() {
+        window.addEventListener("load", function() {
+            window.applicationCache.addEventListener("updateready", function(e) {
+                if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
+                    window.applicationCache.swapCache();
+                    window.location.reload();
+                }
+            }, false);
+        }, false);
     },
     resize: function() {
         var self = this;
diff --git a/couchpotato/static/scripts/couchpotato.js b/couchpotato/static/scripts/couchpotato.js
index 4c0fdae..5d63155 100644
--- a/couchpotato/static/scripts/couchpotato.js
+++ b/couchpotato/static/scripts/couchpotato.js
@@ -46,6 +46,20 @@
 		window.addEvent('resize', self.resize.bind(self));
 		self.resize();
 
+		self.checkCache();
+
+	},
+
+	checkCache: function(){
+		window.addEventListener('load', function() {
+			window.applicationCache.addEventListener('updateready', function(e) {
+				if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
+					window.applicationCache.swapCache();
+					window.location.reload();
+				}
+			}, false);
+
+		}, false);
 	},
 
 	resize: function(){
diff --git a/couchpotato/templates/index.html b/couchpotato/templates/index.html
index 9b612a7..8454f31 100644
--- a/couchpotato/templates/index.html
+++ b/couchpotato/templates/index.html
@@ -1,18 +1,32 @@
 {% autoescape None %}
 <!doctype html>
-<html class="{{ 'dark' if Env.setting('dark_theme') else '' }}" manifest="{{ Env.get('web_base') }}couchpotato.appcache">
+<html class="{{ 'dark' if Env.setting('dark_theme') else '' }}" manifest="{{ Env.get('web_base') }}couchpotato.appcache?{{ 'dark' if Env.setting('dark_theme') else 'light' }}">
 	<head>
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
+		<title>CouchPotato</title>
+		<meta name="viewport" content="minimal-ui, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="mobile-web-app-capable" content="yes" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="msapplication-tap-highlight" content="no" />
 
-		<link href="{{ Env.get('static_path') }}images/favicon.ico" rel="icon" type="image/x-icon" />
-		<link rel="apple-touch-icon" href="{{ Env.get('static_path') }}images/homescreen.png" />
+		{% set icon_path = Env.get('static_path') + 'images/icons/' %}
+		{% set themed_icon_path = icon_path + ('dark/' if Env.setting('dark_theme') else '') %}
+
+		<!-- IOS -->
+		<link rel="apple-touch-icon-precomposed" href="{{ themed_icon_path }}ios.png" />
+
+		<!-- Android -->
+		<link rel="icon" type="image/png" href="{{ themed_icon_path }}android.png" sizes="192x192">
+
+		<!-- Windows 8 -->
+		<meta name="msapplication-TileColor" content="{{ '#f85c22' if Env.setting('dark_theme') else '#ac0000' }}">
+		<meta name="msapplication-TileImage" content="{{ icon_path }}windows.png">
+		<meta name="msapplication-square70x70logo" content="{{ icon_path }}windows.png">
+		<meta name="msapplication-square150x150logo" content="{{ icon_path }}windows.png">
+		<meta name="msapplication-square310x310logo" content="{{ icon_path }}windows.png">
+
+		<link href="{{ icon_path }}favicon.ico" rel="icon" type="image/x-icon" />
 
-		{% for url in fireEvent('clientscript.get_styles', single = True) %}
-		<link data-url="{{ url }}" rel="stylesheet" href="{{ Env.get('web_base') }}{{ url }}" type="text/css">{% end %}
 		{% for url in fireEvent('clientscript.get_scripts', single = True) %}
 		<script type="text/javascript" src="{{ Env.get('web_base') }}{{ url }}"></script>{% end %}
 
@@ -81,7 +95,9 @@
 			{% end %}
 
 		</script>
-		<title>CouchPotato</title>
+
+		{% for url in fireEvent('clientscript.get_styles', single = True) %}
+		<link data-url="{{ url }}" rel="stylesheet" href="{{ Env.get('web_base') }}{{ url }}" type="text/css">{% end %}
 	</head>
 	<body></body>
 </html>