diff --git a/res/stainless steal icons/PNG/128/1.png b/res/stainless steal icons/PNG/128/1.png
new file mode 100755
index 0000000..91c72b9
Binary files /dev/null and b/res/stainless steal icons/PNG/128/1.png differ
diff --git a/res/stainless steal icons/PNG/128/10.png b/res/stainless steal icons/PNG/128/10.png
new file mode 100755
index 0000000..475612e
Binary files /dev/null and b/res/stainless steal icons/PNG/128/10.png differ
diff --git a/res/stainless steal icons/PNG/128/2.png b/res/stainless steal icons/PNG/128/2.png
new file mode 100755
index 0000000..53dfed4
Binary files /dev/null and b/res/stainless steal icons/PNG/128/2.png differ
diff --git a/res/stainless steal icons/PNG/128/3.png b/res/stainless steal icons/PNG/128/3.png
new file mode 100755
index 0000000..cafb49e
Binary files /dev/null and b/res/stainless steal icons/PNG/128/3.png differ
diff --git a/res/stainless steal icons/PNG/128/4.png b/res/stainless steal icons/PNG/128/4.png
new file mode 100755
index 0000000..71814f3
Binary files /dev/null and b/res/stainless steal icons/PNG/128/4.png differ
diff --git a/res/stainless steal icons/PNG/128/5.png b/res/stainless steal icons/PNG/128/5.png
new file mode 100755
index 0000000..fed1b0e
Binary files /dev/null and b/res/stainless steal icons/PNG/128/5.png differ
diff --git a/res/stainless steal icons/PNG/128/6.png b/res/stainless steal icons/PNG/128/6.png
new file mode 100755
index 0000000..22aa452
Binary files /dev/null and b/res/stainless steal icons/PNG/128/6.png differ
diff --git a/res/stainless steal icons/PNG/128/7.png b/res/stainless steal icons/PNG/128/7.png
new file mode 100755
index 0000000..f5be6a9
Binary files /dev/null and b/res/stainless steal icons/PNG/128/7.png differ
diff --git a/res/stainless steal icons/PNG/128/8.png b/res/stainless steal icons/PNG/128/8.png
new file mode 100755
index 0000000..1301abe
Binary files /dev/null and b/res/stainless steal icons/PNG/128/8.png differ
diff --git a/res/stainless steal icons/PNG/128/9.png b/res/stainless steal icons/PNG/128/9.png
new file mode 100755
index 0000000..26bf27e
Binary files /dev/null and b/res/stainless steal icons/PNG/128/9.png differ
diff --git a/res/stainless steal icons/PNG/24/1.png b/res/stainless steal icons/PNG/24/1.png
new file mode 100755
index 0000000..444fa1b
Binary files /dev/null and b/res/stainless steal icons/PNG/24/1.png differ
diff --git a/res/stainless steal icons/PNG/24/10.png b/res/stainless steal icons/PNG/24/10.png
new file mode 100755
index 0000000..cae1f6c
Binary files /dev/null and b/res/stainless steal icons/PNG/24/10.png differ
diff --git a/res/stainless steal icons/PNG/24/2.png b/res/stainless steal icons/PNG/24/2.png
new file mode 100755
index 0000000..ea0bf5b
Binary files /dev/null and b/res/stainless steal icons/PNG/24/2.png differ
diff --git a/res/stainless steal icons/PNG/24/3.png b/res/stainless steal icons/PNG/24/3.png
new file mode 100755
index 0000000..3a97af5
Binary files /dev/null and b/res/stainless steal icons/PNG/24/3.png differ
diff --git a/res/stainless steal icons/PNG/24/4.png b/res/stainless steal icons/PNG/24/4.png
new file mode 100755
index 0000000..1adc132
Binary files /dev/null and b/res/stainless steal icons/PNG/24/4.png differ
diff --git a/res/stainless steal icons/PNG/24/5.png b/res/stainless steal icons/PNG/24/5.png
new file mode 100755
index 0000000..c6ce1c5
Binary files /dev/null and b/res/stainless steal icons/PNG/24/5.png differ
diff --git a/res/stainless steal icons/PNG/24/6.png b/res/stainless steal icons/PNG/24/6.png
new file mode 100755
index 0000000..1df2558
Binary files /dev/null and b/res/stainless steal icons/PNG/24/6.png differ
diff --git a/res/stainless steal icons/PNG/24/7.png b/res/stainless steal icons/PNG/24/7.png
new file mode 100755
index 0000000..ec95e9f
Binary files /dev/null and b/res/stainless steal icons/PNG/24/7.png differ
diff --git a/res/stainless steal icons/PNG/24/8.png b/res/stainless steal icons/PNG/24/8.png
new file mode 100755
index 0000000..981d324
Binary files /dev/null and b/res/stainless steal icons/PNG/24/8.png differ
diff --git a/res/stainless steal icons/PNG/24/9.png b/res/stainless steal icons/PNG/24/9.png
new file mode 100755
index 0000000..f47bc44
Binary files /dev/null and b/res/stainless steal icons/PNG/24/9.png differ
diff --git a/res/stainless steal icons/PNG/256/1.png b/res/stainless steal icons/PNG/256/1.png
new file mode 100755
index 0000000..8a06161
Binary files /dev/null and b/res/stainless steal icons/PNG/256/1.png differ
diff --git a/res/stainless steal icons/PNG/256/10.png b/res/stainless steal icons/PNG/256/10.png
new file mode 100755
index 0000000..5505aa8
Binary files /dev/null and b/res/stainless steal icons/PNG/256/10.png differ
diff --git a/res/stainless steal icons/PNG/256/2.png b/res/stainless steal icons/PNG/256/2.png
new file mode 100755
index 0000000..3028f00
Binary files /dev/null and b/res/stainless steal icons/PNG/256/2.png differ
diff --git a/res/stainless steal icons/PNG/256/3.png b/res/stainless steal icons/PNG/256/3.png
new file mode 100755
index 0000000..1ce6e86
Binary files /dev/null and b/res/stainless steal icons/PNG/256/3.png differ
diff --git a/res/stainless steal icons/PNG/256/4.png b/res/stainless steal icons/PNG/256/4.png
new file mode 100755
index 0000000..a716294
Binary files /dev/null and b/res/stainless steal icons/PNG/256/4.png differ
diff --git a/res/stainless steal icons/PNG/256/5.png b/res/stainless steal icons/PNG/256/5.png
new file mode 100755
index 0000000..124813c
Binary files /dev/null and b/res/stainless steal icons/PNG/256/5.png differ
diff --git a/res/stainless steal icons/PNG/256/6.png b/res/stainless steal icons/PNG/256/6.png
new file mode 100755
index 0000000..d4c396c
Binary files /dev/null and b/res/stainless steal icons/PNG/256/6.png differ
diff --git a/res/stainless steal icons/PNG/256/7.png b/res/stainless steal icons/PNG/256/7.png
new file mode 100755
index 0000000..38d316e
Binary files /dev/null and b/res/stainless steal icons/PNG/256/7.png differ
diff --git a/res/stainless steal icons/PNG/256/8.png b/res/stainless steal icons/PNG/256/8.png
new file mode 100755
index 0000000..4be0fb0
Binary files /dev/null and b/res/stainless steal icons/PNG/256/8.png differ
diff --git a/res/stainless steal icons/PNG/256/9.png b/res/stainless steal icons/PNG/256/9.png
new file mode 100755
index 0000000..11b2226
Binary files /dev/null and b/res/stainless steal icons/PNG/256/9.png differ
diff --git a/res/stainless steal icons/PNG/32/1.png b/res/stainless steal icons/PNG/32/1.png
new file mode 100755
index 0000000..e2ac4fb
Binary files /dev/null and b/res/stainless steal icons/PNG/32/1.png differ
diff --git a/res/stainless steal icons/PNG/32/10.png b/res/stainless steal icons/PNG/32/10.png
new file mode 100755
index 0000000..cb5c640
Binary files /dev/null and b/res/stainless steal icons/PNG/32/10.png differ
diff --git a/res/stainless steal icons/PNG/32/2.png b/res/stainless steal icons/PNG/32/2.png
new file mode 100755
index 0000000..acd5861
Binary files /dev/null and b/res/stainless steal icons/PNG/32/2.png differ
diff --git a/res/stainless steal icons/PNG/32/3.png b/res/stainless steal icons/PNG/32/3.png
new file mode 100755
index 0000000..91f4229
Binary files /dev/null and b/res/stainless steal icons/PNG/32/3.png differ
diff --git a/res/stainless steal icons/PNG/32/4.png b/res/stainless steal icons/PNG/32/4.png
new file mode 100755
index 0000000..bd924ed
Binary files /dev/null and b/res/stainless steal icons/PNG/32/4.png differ
diff --git a/res/stainless steal icons/PNG/32/5.png b/res/stainless steal icons/PNG/32/5.png
new file mode 100755
index 0000000..833f587
Binary files /dev/null and b/res/stainless steal icons/PNG/32/5.png differ
diff --git a/res/stainless steal icons/PNG/32/6.png b/res/stainless steal icons/PNG/32/6.png
new file mode 100755
index 0000000..7360cc6
Binary files /dev/null and b/res/stainless steal icons/PNG/32/6.png differ
diff --git a/res/stainless steal icons/PNG/32/7.png b/res/stainless steal icons/PNG/32/7.png
new file mode 100755
index 0000000..d82ca42
Binary files /dev/null and b/res/stainless steal icons/PNG/32/7.png differ
diff --git a/res/stainless steal icons/PNG/32/8.png b/res/stainless steal icons/PNG/32/8.png
new file mode 100755
index 0000000..575a9ff
Binary files /dev/null and b/res/stainless steal icons/PNG/32/8.png differ
diff --git a/res/stainless steal icons/PNG/32/9.png b/res/stainless steal icons/PNG/32/9.png
new file mode 100755
index 0000000..2148ec8
Binary files /dev/null and b/res/stainless steal icons/PNG/32/9.png differ
diff --git a/res/stainless steal icons/PNG/48/1.png b/res/stainless steal icons/PNG/48/1.png
new file mode 100755
index 0000000..181df85
Binary files /dev/null and b/res/stainless steal icons/PNG/48/1.png differ
diff --git a/res/stainless steal icons/PNG/48/10.png b/res/stainless steal icons/PNG/48/10.png
new file mode 100755
index 0000000..11391cb
Binary files /dev/null and b/res/stainless steal icons/PNG/48/10.png differ
diff --git a/res/stainless steal icons/PNG/48/2.png b/res/stainless steal icons/PNG/48/2.png
new file mode 100755
index 0000000..781fc68
Binary files /dev/null and b/res/stainless steal icons/PNG/48/2.png differ
diff --git a/res/stainless steal icons/PNG/48/3.png b/res/stainless steal icons/PNG/48/3.png
new file mode 100755
index 0000000..7e41060
Binary files /dev/null and b/res/stainless steal icons/PNG/48/3.png differ
diff --git a/res/stainless steal icons/PNG/48/4.png b/res/stainless steal icons/PNG/48/4.png
new file mode 100755
index 0000000..c25a2ed
Binary files /dev/null and b/res/stainless steal icons/PNG/48/4.png differ
diff --git a/res/stainless steal icons/PNG/48/5.png b/res/stainless steal icons/PNG/48/5.png
new file mode 100755
index 0000000..de4bca1
Binary files /dev/null and b/res/stainless steal icons/PNG/48/5.png differ
diff --git a/res/stainless steal icons/PNG/48/6.png b/res/stainless steal icons/PNG/48/6.png
new file mode 100755
index 0000000..6829bee
Binary files /dev/null and b/res/stainless steal icons/PNG/48/6.png differ
diff --git a/res/stainless steal icons/PNG/48/7.png b/res/stainless steal icons/PNG/48/7.png
new file mode 100755
index 0000000..26f7269
Binary files /dev/null and b/res/stainless steal icons/PNG/48/7.png differ
diff --git a/res/stainless steal icons/PNG/48/8.png b/res/stainless steal icons/PNG/48/8.png
new file mode 100755
index 0000000..86ab43a
Binary files /dev/null and b/res/stainless steal icons/PNG/48/8.png differ
diff --git a/res/stainless steal icons/PNG/48/9.png b/res/stainless steal icons/PNG/48/9.png
new file mode 100755
index 0000000..57675bf
Binary files /dev/null and b/res/stainless steal icons/PNG/48/9.png differ
diff --git a/res/stainless steal icons/PNG/64/1.png b/res/stainless steal icons/PNG/64/1.png
new file mode 100755
index 0000000..5ac1e73
Binary files /dev/null and b/res/stainless steal icons/PNG/64/1.png differ
diff --git a/res/stainless steal icons/PNG/64/10.png b/res/stainless steal icons/PNG/64/10.png
new file mode 100755
index 0000000..77cc3b1
Binary files /dev/null and b/res/stainless steal icons/PNG/64/10.png differ
diff --git a/res/stainless steal icons/PNG/64/2.png b/res/stainless steal icons/PNG/64/2.png
new file mode 100755
index 0000000..03e2d3f
Binary files /dev/null and b/res/stainless steal icons/PNG/64/2.png differ
diff --git a/res/stainless steal icons/PNG/64/3.png b/res/stainless steal icons/PNG/64/3.png
new file mode 100755
index 0000000..094bc07
Binary files /dev/null and b/res/stainless steal icons/PNG/64/3.png differ
diff --git a/res/stainless steal icons/PNG/64/4.png b/res/stainless steal icons/PNG/64/4.png
new file mode 100755
index 0000000..b6c5832
Binary files /dev/null and b/res/stainless steal icons/PNG/64/4.png differ
diff --git a/res/stainless steal icons/PNG/64/5.png b/res/stainless steal icons/PNG/64/5.png
new file mode 100755
index 0000000..46d76a6
Binary files /dev/null and b/res/stainless steal icons/PNG/64/5.png differ
diff --git a/res/stainless steal icons/PNG/64/6.png b/res/stainless steal icons/PNG/64/6.png
new file mode 100755
index 0000000..4604ee2
Binary files /dev/null and b/res/stainless steal icons/PNG/64/6.png differ
diff --git a/res/stainless steal icons/PNG/64/7.png b/res/stainless steal icons/PNG/64/7.png
new file mode 100755
index 0000000..295b691
Binary files /dev/null and b/res/stainless steal icons/PNG/64/7.png differ
diff --git a/res/stainless steal icons/PNG/64/8.png b/res/stainless steal icons/PNG/64/8.png
new file mode 100755
index 0000000..b6ac80f
Binary files /dev/null and b/res/stainless steal icons/PNG/64/8.png differ
diff --git a/res/stainless steal icons/PNG/64/9.png b/res/stainless steal icons/PNG/64/9.png
new file mode 100755
index 0000000..a558f6f
Binary files /dev/null and b/res/stainless steal icons/PNG/64/9.png differ
diff --git a/res/stainless steal icons/iconleak.txt b/res/stainless steal icons/iconleak.txt
new file mode 100755
index 0000000..2346d72
--- /dev/null
+++ b/res/stainless steal icons/iconleak.txt	
@@ -0,0 +1,5 @@
+Welcome to IconLeak - Where Icons leak from love.
+ 
+Homepage : http://iconleak.com
+
+You can find more free premium icon set in our site, and you are welcome to use it.
\ No newline at end of file
diff --git a/src/css/images/mail-128.png b/src/css/images/mail-128.png
new file mode 100755
index 0000000..cafb49e
Binary files /dev/null and b/src/css/images/mail-128.png differ
diff --git a/src/css/styles.css b/src/css/styles.css
index 61d611f..259f954 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -32,7 +32,7 @@ textarea.ui-input-text {
 	height: 128px;
 	margin-left: auto;
 	margin-right: auto;
-	background-image: url('images/key-128.png');
+	background-image: url('images/mail-128.png');
 	background-repeat: no-repeat;
 }
 
diff --git a/src/install.html b/src/install.html
index 6e275ed..e0db869 100644
--- a/src/install.html
+++ b/src/install.html
@@ -2,8 +2,10 @@
   <body>
     <p>Packaged app installation page</p>
     <script>
-      // This URL must be a full url.
-      var manifestUrl = window.location.href.replace('install.html', 'manifest.webapp');
+      var base = window.location.href.split("#")[0]; // WORKAROUND: remove hash from url
+      base = base.replace("/install.html",""); // WORKAROUND: remove index.html
+      var manifestUrl = base + '/manifest.webapp';
+
       var req = navigator.mozApps.install(manifestUrl);
       req.onsuccess = function() {
         alert('Success: ' + this.result.origin);
diff --git a/src/js/app-controller.js b/src/js/app-controller.js
index 972dd0f..43fde2f 100644
--- a/src/js/app-controller.js
+++ b/src/js/app-controller.js
@@ -29,7 +29,7 @@ define(['jquery', 'js/dao/email-dao', 'js/dao/keychain-dao', 'js/dao/cloudstorag
 		];
 
 		// are we running in native app or in browser?
-		if (document.URL.indexOf("http") === 0 || document.URL.indexOf("chrome") === 0) {
+		if (document.URL.indexOf("http") === 0 || document.URL.indexOf("app") === 0 || document.URL.indexOf("chrome") === 0) {
 			console.log('Assuming Browser environment...');
 			onDeviceReady();
 		} else {
diff --git a/src/manifest.json b/src/manifest.json
index bb2fb92..5869824 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -5,7 +5,7 @@
   "manifest_version": 2,
   "offline_enabled": true,
   "icons": {
-    "128": "css/images/key-128.png"
+    "128": "css/images/mail-128.png"
   },
   "permissions": [
       "https://storage.whiteout.io/"
diff --git a/src/manifest.webapp b/src/manifest.webapp
index 1175a36..2c4c596 100644
--- a/src/manifest.webapp
+++ b/src/manifest.webapp
@@ -1,14 +1,14 @@
 {
 	"name": "Whiteout",
-	"description": "HTML5 Mail with an encrypted message store both locally and in the cloud",
-	"launch_path": "/mail-html5/src/",
+	"description": "Email service with end-2-end encrypted messaging and client-side encrypted sync to the cloud. Your data belongs only to you.",
+	"version": "0.1",
+	"launch_path": "/src/index.html",
 	"icons": {
-		"128": "/mail-html5/src/css/images/key-128.png"
+		"128": "/src/css/images/mail-128.png"
 	},
 	"developer": {
 		"name": "Whiteout Networks GmbH",
 		"url": "http://whiteout.io"
 	},
-	"csp": "default-src *; script-src 'self' 'unsafe-eval'; options eval-script; object-src 'none'; style-src 'self' 'unsafe-inline'",
 	"default_locale": "en"
 }
\ No newline at end of file