diff --git a/manifest.json b/manifest.json
index bd78658ad..b41f71977 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,71 +8,66 @@
     ],
     "start_url": ".?utm_source=pwa",
     "display": "standalone",
-    "theme_color": "#FFFFFF",
-    "background_color": "#FFFFFF",
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
     "orientation": "any",
+    "android_package_name": "com.akaunting.akaunting",
+    "prefer_related_applications": true,
+    "related_applications": [
+        {
+            "id": "com.akaunting.akaunting",
+            "platform": "play",
+            "url": "https://play.google.com/store/apps/details?id=com.akaunting.akaunting"
+        },
+        {
+            "platform": "itunes",
+            "url": "https://apps.apple.com/us/app/akaunting/id1573240410"
+        }
+    ],
     "splash": {
-        "640x1136":  "public/img/icons/splash-640x1136.png",
-        "750x1334":  "public/img/icons/splash-750x1334.png",
-        "828x1792":  "public/img/icons/splash-828x1792.png",
-        "1125x2436": "public/img/icons/splash-1125x2436.png",
-        "1242x2208": "public/img/icons/splash-1242x2208.png",
-        "1242x2688": "public/img/icons/splash-1242x2688.png",
-        "1536x2048": "public/img/icons/splash-1536x2048.png",
-        "1668x2224": "public/img/icons/splash-1668x2224.png",
-        "1668x2388": "public/img/icons/splash-1668x2388.png",
-        "2048x2732": "public/img/icons/splash-2048x2732.png"
+        "640x1136":  "public/img/pwa/splash-640x1136.png",
+        "750x1334":  "public/img/pwa/splash-750x1334.png",
+        "828x1792":  "public/img/pwa/splash-828x1792.png",
+        "1125x2436": "public/img/pwa/splash-1125x2436.png",
+        "1242x2208": "public/img/pwa/splash-1242x2208.png",
+        "1242x2688": "public/img/pwa/splash-1242x2688.png",
+        "1536x2048": "public/img/pwa/splash-1536x2048.png",
+        "1668x2224": "public/img/pwa/splash-1668x2224.png",
+        "1668x2388": "public/img/pwa/splash-1668x2388.png",
+        "2048x2732": "public/img/pwa/splash-2048x2732.png"
     },
     "icons": [
         {
-            "src": "public/img/icons/akaunting-72x72.png",
-            "type": "image/png",
-            "sizes": "72x72"
-        },
-        {
-            "src": "public/img/icons/akaunting-96x96.png",
-            "type": "image/png",
-            "sizes": "96x96"
-        },
-        {
-            "src": "public/img/icons/akaunting-128x128.png",
-            "type": "image/png",
-            "sizes": "128x128"
-        },
-        {
-            "src": "public/img/icons/akaunting-144x144.png",
-            "type": "image/png",
-            "sizes": "144x144"
-        },
-        {
-            "src": "public/img/icons/akaunting-152x152.png",
-            "type": "image/png",
-            "sizes": "152x152"
-        },
-        {
-            "src": "public/img/icons/akaunting-192x192.png",
+            "src": "public/img/pwa/icon-192x192.png",
             "type": "image/png",
             "sizes": "192x192"
         },
         {
-            "src": "public/img/icons/akaunting-384x384.png",
+            "purpose": "maskable",
+            "src": "public/img/pwa/icon-192x192-maskable.png",
             "type": "image/png",
-            "sizes": "384x384"
+            "sizes": "192x192"
         },
         {
-            "src": "public/img/icons/akaunting-512x512.png",
-            "type": "image/png",
-            "sizes": "512x512"
+            "src": "public/img/pwa/icon-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "purpose": "maskable",
+            "src": "public/img/pwa/icon-512x512-maskable.png",
+            "sizes": "512x512",
+            "type": "image/png"
         }
     ],
     "screenshots": [
         {
-            "src": "public/img/screenshots/dashboard.png",
+            "src": "public/img/pwa/screenshot-dashboard.png",
             "sizes": "1932x1394",
             "type": "image/png"
         },
         {
-            "src": "public/img/screenshots/invoice.png",
+            "src": "public/img/pwa/screenshot-invoice.png",
             "sizes": "2748x1986",
             "type": "image/png"
         }
@@ -85,8 +80,8 @@
             "url": "sales/invoices/create?utm_source=pwa",
             "icons": [
                 {
-                    "src": "public/img/icons/akaunting-192x192.png",
-                    "sizes": "192x192"
+                    "src": "public/img/pwa/icon-192x192.png",
+					"sizes": "192x192"
                 }
             ]
         },
@@ -97,8 +92,8 @@
             "url": "banking/transactions/create?type=income&utm_source=pwa",
             "icons": [
                 {
-                    "src": "public/img/icons/akaunting-192x192.png",
-                    "sizes": "192x192"
+                    "src": "public/img/pwa/icon-192x192.png",
+					"sizes": "192x192"
                 }
             ]
         },
@@ -109,8 +104,8 @@
             "url": "purchases/bills/create?utm_source=pwa",
             "icons": [
                 {
-                    "src": "public/img/icons/akaunting-192x192.png",
-                    "sizes": "192x192"
+                    "src": "public/img/pwa/icon-192x192.png",
+					"sizes": "192x192"
                 }
             ]
         },
@@ -121,8 +116,8 @@
             "url": "banking/transactions/create?type=expense&utm_source=pwa",
             "icons": [
                 {
-                    "src": "public/img/icons/akaunting-192x192.png",
-                    "sizes": "192x192"
+                    "src": "public/img/pwa/icon-192x192.png",
+					"sizes": "192x192"
                 }
             ]
         }
diff --git a/public/img/icons/.gitkeep b/public/img/icons/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/img/icons/akaunting-128x128.png b/public/img/icons/akaunting-128x128.png
deleted file mode 100644
index 339784bcf..000000000
Binary files a/public/img/icons/akaunting-128x128.png and /dev/null differ
diff --git a/public/img/icons/akaunting-144x144.png b/public/img/icons/akaunting-144x144.png
deleted file mode 100644
index 670add3d2..000000000
Binary files a/public/img/icons/akaunting-144x144.png and /dev/null differ
diff --git a/public/img/icons/akaunting-152x152.png b/public/img/icons/akaunting-152x152.png
deleted file mode 100644
index d64dc1ce4..000000000
Binary files a/public/img/icons/akaunting-152x152.png and /dev/null differ
diff --git a/public/img/icons/akaunting-192x192.png b/public/img/icons/akaunting-192x192.png
deleted file mode 100644
index dd7f6844e..000000000
Binary files a/public/img/icons/akaunting-192x192.png and /dev/null differ
diff --git a/public/img/icons/akaunting-384x384.png b/public/img/icons/akaunting-384x384.png
deleted file mode 100644
index 34beff1e9..000000000
Binary files a/public/img/icons/akaunting-384x384.png and /dev/null differ
diff --git a/public/img/icons/akaunting-512x512.png b/public/img/icons/akaunting-512x512.png
deleted file mode 100644
index fb9d36f98..000000000
Binary files a/public/img/icons/akaunting-512x512.png and /dev/null differ
diff --git a/public/img/icons/akaunting-72x72.png b/public/img/icons/akaunting-72x72.png
deleted file mode 100644
index 15e318255..000000000
Binary files a/public/img/icons/akaunting-72x72.png and /dev/null differ
diff --git a/public/img/icons/akaunting-96x96.png b/public/img/icons/akaunting-96x96.png
deleted file mode 100644
index 3212a6bfe..000000000
Binary files a/public/img/icons/akaunting-96x96.png and /dev/null differ
diff --git a/public/img/pwa/icon-192x192-maskable.png b/public/img/pwa/icon-192x192-maskable.png
new file mode 100644
index 000000000..9d9f89b2c
Binary files /dev/null and b/public/img/pwa/icon-192x192-maskable.png differ
diff --git a/public/img/pwa/icon-192x192.png b/public/img/pwa/icon-192x192.png
new file mode 100644
index 000000000..1d8822bcb
Binary files /dev/null and b/public/img/pwa/icon-192x192.png differ
diff --git a/public/img/pwa/icon-512x512-maskable.png b/public/img/pwa/icon-512x512-maskable.png
new file mode 100644
index 000000000..6179fa56f
Binary files /dev/null and b/public/img/pwa/icon-512x512-maskable.png differ
diff --git a/public/img/pwa/icon-512x512.png b/public/img/pwa/icon-512x512.png
new file mode 100644
index 000000000..a22a66da8
Binary files /dev/null and b/public/img/pwa/icon-512x512.png differ
diff --git a/public/img/screenshots/dashboard.png b/public/img/pwa/screenshot-dashboard.png
similarity index 100%
rename from public/img/screenshots/dashboard.png
rename to public/img/pwa/screenshot-dashboard.png
diff --git a/public/img/screenshots/invoice.png b/public/img/pwa/screenshot-invoice.png
similarity index 100%
rename from public/img/screenshots/invoice.png
rename to public/img/pwa/screenshot-invoice.png
diff --git a/public/img/icons/splash-1242x2208.png b/public/img/pwa/splash-1242x2208.png
similarity index 100%
rename from public/img/icons/splash-1242x2208.png
rename to public/img/pwa/splash-1242x2208.png
diff --git a/public/img/icons/splash-1242x2688.png b/public/img/pwa/splash-1242x2688.png
similarity index 100%
rename from public/img/icons/splash-1242x2688.png
rename to public/img/pwa/splash-1242x2688.png
diff --git a/public/img/icons/splash-1536x2048.png b/public/img/pwa/splash-1536x2048.png
similarity index 100%
rename from public/img/icons/splash-1536x2048.png
rename to public/img/pwa/splash-1536x2048.png
diff --git a/public/img/icons/splash-1668x2224.png b/public/img/pwa/splash-1668x2224.png
similarity index 100%
rename from public/img/icons/splash-1668x2224.png
rename to public/img/pwa/splash-1668x2224.png
diff --git a/public/img/icons/splash-1668x2388.png b/public/img/pwa/splash-1668x2388.png
similarity index 100%
rename from public/img/icons/splash-1668x2388.png
rename to public/img/pwa/splash-1668x2388.png
diff --git a/public/img/icons/splash-2048x2732.png b/public/img/pwa/splash-2048x2732.png
similarity index 100%
rename from public/img/icons/splash-2048x2732.png
rename to public/img/pwa/splash-2048x2732.png
diff --git a/public/img/icons/splash-640x1136.png b/public/img/pwa/splash-640x1136.png
similarity index 100%
rename from public/img/icons/splash-640x1136.png
rename to public/img/pwa/splash-640x1136.png
diff --git a/public/img/icons/splash-750x1334.png b/public/img/pwa/splash-750x1334.png
similarity index 100%
rename from public/img/icons/splash-750x1334.png
rename to public/img/pwa/splash-750x1334.png
diff --git a/public/img/icons/splash-828x1792.png b/public/img/pwa/splash-828x1792.png
similarity index 100%
rename from public/img/icons/splash-828x1792.png
rename to public/img/pwa/splash-828x1792.png
diff --git a/resources/views/components/layouts/pwa/head.blade.php b/resources/views/components/layouts/pwa/head.blade.php
index 34c8f292c..40c2e712e 100644
--- a/resources/views/components/layouts/pwa/head.blade.php
+++ b/resources/views/components/layouts/pwa/head.blade.php
@@ -2,37 +2,35 @@
 <link rel="manifest" href="{{ asset('manifest.json') }}">
 
 <!-- Chrome for Android theme color -->
-<meta name="theme-color" content="#FFFFFF">
+<meta name="theme-color" content="#ffffff">
 
 <!-- Add to homescreen for Chrome on Android -->
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="application-name" content="{{ config('app.name') }}">
-<link rel="icon" sizes="512x512" href="{{ asset('public/img/icons/akaunting-512x512.png') }}">
+<link rel="icon" sizes="512x512" href="{{ asset('public/img/pwa/akaunting-512x512.png') }}">
 
 <!-- Add to homescreen for Safari on iOS -->
 <meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="#FFFFFF">
+<meta name="apple-mobile-web-app-status-bar-style" content="#ffffff">
 <meta name="apple-mobile-web-app-title" content="{{ config('app.name') }}">
-<link rel="apple-touch-icon" href="{{ asset('public/img/icons/akaunting-512x512.png') }}">
+<link rel="apple-touch-icon" href="{{ asset('public/img/pwa/akaunting-512x512.png') }}">
 
-<link href="{{ asset('public/img/icons/splash-640x1136.png') }}" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-750x1334.png') }}" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-828x1792.png') }}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-1242x2208.png') }}" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-1242x2688.png') }}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-1536x2048.png') }}" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-1668x2224.png') }}" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-1668x2388.png') }}" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
-<link href="{{ asset('public/img/icons/splash-2048x2732.png') }}" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-640x1136.png') }}" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-750x1334.png') }}" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-828x1792.png') }}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-1242x2208.png') }}" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-1242x2688.png') }}" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-1536x2048.png') }}" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-1668x2224.png') }}" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-1668x2388.png') }}" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
+<link href="{{ asset('public/img/pwa/splash-2048x2732.png') }}" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
 
 <!-- Tile for Win8 -->
-<meta name="msapplication-TileColor" content="#FFFFFF">
-<meta name="msapplication-TileImage" content="{{ asset('public/img/icons/akaunting-512x512.png') }}">
+<meta name="msapplication-TileColor" content="#ffffff">
+<meta name="msapplication-TileImage" content="{{ asset('public/img/pwa/akaunting-512x512.png') }}">
 
 <script type="text/javascript">
-
     if ('serviceWorker' in navigator) {
         navigator.serviceWorker.register("{{ asset('serviceworker.js') }}");
     }
-
 </script>
diff --git a/serviceworker.js b/serviceworker.js
index cdd7b4748..2ae1fe747 100644
--- a/serviceworker.js
+++ b/serviceworker.js
@@ -1,13 +1,7 @@
 var staticCacheName = "pwa-v" + new Date().getTime();
 var filesToCache = [
-    'public/img/icons/akaunting-72x72.png',
-    'public/img/icons/akaunting-96x96.png',
-    'public/img/icons/akaunting-128x128.png',
-    'public/img/icons/akaunting-144x144.png',
-    'public/img/icons/akaunting-152x152.png',
-    'public/img/icons/akaunting-192x192.png',
-    'public/img/icons/akaunting-384x384.png',
-    'public/img/icons/akaunting-512x512.png'
+    'public/img/pwa/akaunting-192x192.png',
+    'public/img/pwa/akaunting-512x512.png'
 ];
 
 /*