diff --git a/public/favicon.ico b/public/favicon.ico
index 638b826f..8352d15b 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/index.html b/public/index.html
index c6fb3383..4a291177 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,8 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <link rel="icon" type="image/png" sizes="64x64" href="/web-icons/favicon-64x64.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/web-icons/favicon-32x32.png">
   <title>Dashy</title>
 </head>
 
diff --git a/public/manifest.json b/public/manifest.json
index 1c006cc5..a0447af2 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,6 +1,14 @@
 {
-  "name": "Dashy",
+  "name": "Dashy Web",
   "short_name": "Dashy",
+  "description": "A Dashboard for your Homelab",
+  "scope": "/",
+  "start_url": "./index.html",
+  "display": "standalone",
+  "background_color": "#0b1021",
+  "theme_color": "#4DBA87",
+  "lang": "en-GB",
+  "orientation": "portrait-primary",
   "icons": [
     {
       "src": "./web-icons/windows10/SmallTile.scale-100.png",
@@ -507,8 +515,42 @@
       "sizes": "16x16"
     }
   ],
-  "start_url": "./index.html",
-  "display": "standalone",
-  "background_color": "#0b1021",
-  "theme_color": "#4DBA87"
+  "screenshots": [
+    {
+      "src": "./web-icons/screenshots/dashy-scrsht-1.png",
+      "sizes": "1523x1347",
+      "type": "image/png",
+      "label": "Dashy example homelab with Callisto theme"
+    },
+    {
+      "src": "./web-icons/screenshots/dashy-scrsht-2.png",
+      "sizes": "1264x861",
+      "type": "image/png",
+      "label": "Example, Networking services with Minimal Dark theme and a Horizontal layout"
+    },
+    {
+      "src": "./web-icons/screenshots/dashy-scrsht-3.png",
+      "sizes": "1303x864",
+      "type": "image/png",
+      "label": "Dashy example homelab with Material theme and auto-fetched favicons"
+    },
+    {
+      "src": "./web-icons/screenshots/dashy-scrsht-4.png",
+      "sizes": "1273x865",
+      "type": "image/png",
+      "label": "Dashy CFT Toolbox using Matrix theme"
+    },
+    {
+      "src": "./web-icons/screenshots/dashy-scrsht-5.png",
+      "sizes": "1146x851",
+      "type": "image/png",
+      "label": "Dashy as a Bookmark Manager, with Dracula theme and Font-Awesome icons"
+    },
+    {
+      "src": "./web-icons/screenshots/dashy-scrsht-6.png",
+      "sizes": "1147x872",
+      "type": "image/png",
+      "label": "Dashy example homelab with Nord theme"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/public/web-icons/dashy-logo.png b/public/web-icons/dashy-logo.png
new file mode 100644
index 00000000..78fabd25
Binary files /dev/null and b/public/web-icons/dashy-logo.png differ
diff --git a/public/web-icons/favicon-32x32.png b/public/web-icons/favicon-32x32.png
new file mode 100644
index 00000000..1c0a2979
Binary files /dev/null and b/public/web-icons/favicon-32x32.png differ
diff --git a/public/web-icons/favicon-64x64.png b/public/web-icons/favicon-64x64.png
new file mode 100644
index 00000000..369f1c60
Binary files /dev/null and b/public/web-icons/favicon-64x64.png differ
diff --git a/vue.config.js b/vue.config.js
index e32bc3cf..fd2297b9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -17,11 +17,17 @@ module.exports = {
 
   pwa: {
     name: 'Dashy',
-    themeColor: '#00CCB4',
+    manifestPath: './public/manifest.json',
+    themeColor: '#00af87',
     msTileColor: '#0b1021',
-    manifestCrossorigin: 'use-credentials',
+    iconPaths: {
+      manifestCrossorigin: 'use-credentials',
+      favicon64: './public/web-icons/favicon-64x64.png',
+      favicon32: './public/web-icons/favicon-32x32.png',
+      maskIcon: './public/web-icons/dashy-logo.png',
+      msTileImage: './public/web-icons/dashy-logo.png',
+    },
   },
-
   pages: {
     dashy: {
       entry: 'src/main.js',