diff --git a/index.html b/index.html
index 660368d..f0e64d1 100644
--- a/index.html
+++ b/index.html
@@ -5,9 +5,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>JSoD - JS on Demand</title>
 
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
-    <link rel="icon" href="/favicon.ico" sizes="48x48" />
-    <link rel="icon" href="/favicon.svg" sizes="any" type="image/svg+xml" />
+    <link rel="apple-touch-icon" href="/icons/pwa-icon_x180.png" />
+    <link rel="icon" href="/icons/favicon.ico" sizes="32x32" />
+    <link
+      rel="icon"
+      href="/icons/favicon.svg"
+      sizes="any"
+      type="image/svg+xml"
+    />
     <meta
       name="theme-color"
       content="#fdfefb"
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
deleted file mode 100644
index fce8a6a..0000000
Binary files a/public/apple-touch-icon.png and /dev/null differ
diff --git a/public/LICENSE-LUCIDE.txt b/public/icons/LICENSE-LUCIDE.txt
similarity index 100%
rename from public/LICENSE-LUCIDE.txt
rename to public/icons/LICENSE-LUCIDE.txt
diff --git a/public/favicon.ico b/public/icons/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to public/icons/favicon.ico
diff --git a/public/favicon.svg b/public/icons/favicon.svg
similarity index 100%
rename from public/favicon.svg
rename to public/icons/favicon.svg
diff --git a/public/icons/pwa-icon_x1080.png b/public/icons/pwa-icon_x1080.png
new file mode 100644
index 0000000..03bad5e
Binary files /dev/null and b/public/icons/pwa-icon_x1080.png differ
diff --git a/public/icons/pwa-icon_x180.png b/public/icons/pwa-icon_x180.png
new file mode 100644
index 0000000..ac46ddb
Binary files /dev/null and b/public/icons/pwa-icon_x180.png differ
diff --git a/public/icons/pwa-icon_x196.png b/public/icons/pwa-icon_x196.png
new file mode 100644
index 0000000..ec4214c
Binary files /dev/null and b/public/icons/pwa-icon_x196.png differ
diff --git a/public/icons/pwa-icon_x512.png b/public/icons/pwa-icon_x512.png
new file mode 100644
index 0000000..06e323d
Binary files /dev/null and b/public/icons/pwa-icon_x512.png differ
diff --git a/public/icons/pwa-maskable_icon_x1080.png b/public/icons/pwa-maskable_icon_x1080.png
new file mode 100644
index 0000000..387e41f
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x1080.png differ
diff --git a/public/icons/pwa-maskable_icon_x128.png b/public/icons/pwa-maskable_icon_x128.png
new file mode 100644
index 0000000..690840a
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x128.png differ
diff --git a/public/icons/pwa-maskable_icon_x192.png b/public/icons/pwa-maskable_icon_x192.png
new file mode 100644
index 0000000..1d2dcfb
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x192.png differ
diff --git a/public/icons/pwa-maskable_icon_x384.png b/public/icons/pwa-maskable_icon_x384.png
new file mode 100644
index 0000000..7d6f027
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x384.png differ
diff --git a/public/icons/pwa-maskable_icon_x48.png b/public/icons/pwa-maskable_icon_x48.png
new file mode 100644
index 0000000..27a5bcd
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x48.png differ
diff --git a/public/icons/pwa-maskable_icon_x512.png b/public/icons/pwa-maskable_icon_x512.png
new file mode 100644
index 0000000..525df18
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x512.png differ
diff --git a/public/icons/pwa-maskable_icon_x64.png b/public/icons/pwa-maskable_icon_x64.png
new file mode 100644
index 0000000..814352a
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x64.png differ
diff --git a/public/icons/pwa-maskable_icon_x72.png b/public/icons/pwa-maskable_icon_x72.png
new file mode 100644
index 0000000..8a2fd52
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x72.png differ
diff --git a/public/icons/pwa-maskable_icon_x96.png b/public/icons/pwa-maskable_icon_x96.png
new file mode 100644
index 0000000..437b47a
Binary files /dev/null and b/public/icons/pwa-maskable_icon_x96.png differ
diff --git a/public/pwa-192x192.png b/public/pwa-192x192.png
deleted file mode 100644
index 717bab4..0000000
Binary files a/public/pwa-192x192.png and /dev/null differ
diff --git a/public/pwa-512x512.png b/public/pwa-512x512.png
deleted file mode 100644
index 11d8f33..0000000
Binary files a/public/pwa-512x512.png and /dev/null differ
diff --git a/public/pwa-maskable-192x192.png b/public/pwa-maskable-192x192.png
deleted file mode 100644
index eaa1bfa..0000000
Binary files a/public/pwa-maskable-192x192.png and /dev/null differ
diff --git a/public/pwa-maskable-512x512.png b/public/pwa-maskable-512x512.png
deleted file mode 100644
index 41e158d..0000000
Binary files a/public/pwa-maskable-512x512.png and /dev/null differ
diff --git a/public/desktop-1.jpeg b/public/screenshots/desktop-1.jpeg
similarity index 100%
rename from public/desktop-1.jpeg
rename to public/screenshots/desktop-1.jpeg
diff --git a/public/mobile-1.jpeg b/public/screenshots/mobile-1.jpeg
similarity index 100%
rename from public/mobile-1.jpeg
rename to public/screenshots/mobile-1.jpeg
diff --git a/public/mobile-2.jpeg b/public/screenshots/mobile-2.jpeg
similarity index 100%
rename from public/mobile-2.jpeg
rename to public/screenshots/mobile-2.jpeg
diff --git a/vite.config.ts b/vite.config.ts
index 186d245..b27a7dc 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,6 +13,43 @@ const replaceOptions: RollupReplaceOptions = {
   preventAssignment: true,
 };
 
+const generateIcons = (basePath: string) => {
+  const MASKABLE_ICONS_SIZES = [
+    '1080',
+    '512',
+    '384',
+    '192',
+    '128',
+    '96',
+    '72',
+    '64',
+    '48',
+  ];
+  const NO_MASKABLE_ICONS_SIZES = ['1080', '512', '196', '180'];
+  const MASKABLE_ICONS_NAME = 'pwa-maskable_icon_x';
+  const NO_MASKABLE_ICONS_NAME = 'pwa-icon_x';
+
+  const maskableIcons = MASKABLE_ICONS_SIZES.map((size) => {
+    return {
+      src: `${basePath}/icons/${MASKABLE_ICONS_NAME}${size}.png`,
+      sizes: `${size}x${size}`,
+      type: 'image/png',
+      purpose: 'maskable',
+    };
+  });
+
+  const nonMaskableIcons = NO_MASKABLE_ICONS_SIZES.map((size) => {
+    return {
+      src: `${basePath}/icons/${NO_MASKABLE_ICONS_NAME}${size}.png`,
+      sizes: `${size}x${size}`,
+      type: 'image/png',
+      purpose: 'any',
+    };
+  });
+
+  return [...maskableIcons, ...nonMaskableIcons];
+};
+
 export default defineConfig(({ mode }) => {
   process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
   process.env.BASE_URL = process.env.VITE_BASE_URL ?? '';
@@ -50,50 +87,25 @@ export default defineConfig(({ mode }) => {
           ],
           screenshots: [
             {
-              src: `${process.env.BASE_URL}/desktop-1.jpeg`,
+              src: `${process.env.BASE_URL}/screenshots/desktop-1.jpeg`,
               sizes: '1694×930',
               type: 'image/jpeg',
               form_factor: 'wide',
             },
             {
-              src: `${process.env.BASE_URL}/mobile-1.jpeg`,
+              src: `${process.env.BASE_URL}/screenshots/mobile-1.jpeg`,
               sizes: '412×915',
               type: 'image/jpeg',
               form_factor: 'narrow',
             },
             {
-              src: `${process.env.BASE_URL}/mobile-2.jpeg`,
+              src: `${process.env.BASE_URL}/screenshots/mobile-2.jpeg`,
               sizes: '412×915',
               type: 'image/jpeg',
               form_factor: 'narrow',
             },
           ],
-          icons: [
-            {
-              src: `${process.env.BASE_URL}/pwa-192x192.png`,
-              sizes: '192x192',
-              type: 'image/png',
-              purpose: 'any',
-            },
-            {
-              src: `${process.env.BASE_URL}/pwa-512x512.png`,
-              sizes: '512x512',
-              type: 'image/png',
-              purpose: 'any',
-            },
-            {
-              src: `${process.env.BASE_URL}/pwa-maskable-192x192.png`,
-              sizes: '192x192',
-              type: 'image/png',
-              purpose: 'maskable',
-            },
-            {
-              src: `${process.env.BASE_URL}/pwa-maskable-512x512.png`,
-              sizes: '512x512',
-              type: 'image/png',
-              purpose: 'maskable',
-            },
-          ],
+          icons: generateIcons(process.env.BASE_URL),
         },
         workbox: {
           globPatterns: ['**/*.{html,js,css,svg,woff,woff2,ttf,eot,ico,wasm}'],