diff --git a/public/icons/apple/icon-114x114.png b/public/appicon/icon-114x114.png
similarity index 100%
rename from public/icons/apple/icon-114x114.png
rename to public/appicon/icon-114x114.png
diff --git a/public/icons/apple/icon-120x120.png b/public/appicon/icon-120x120.png
similarity index 100%
rename from public/icons/apple/icon-120x120.png
rename to public/appicon/icon-120x120.png
diff --git a/public/icons/android/icon-144x144.png b/public/appicon/icon-144x144.png
similarity index 100%
rename from public/icons/android/icon-144x144.png
rename to public/appicon/icon-144x144.png
diff --git a/public/icons/apple/icon-152x152.png b/public/appicon/icon-152x152.png
similarity index 100%
rename from public/icons/apple/icon-152x152.png
rename to public/appicon/icon-152x152.png
diff --git a/public/icons/apple/icon-180x180.png b/public/appicon/icon-180x180.png
similarity index 100%
rename from public/icons/apple/icon-180x180.png
rename to public/appicon/icon-180x180.png
diff --git a/public/icons/android/icon-36x36.png b/public/appicon/icon-36x36.png
similarity index 100%
rename from public/icons/android/icon-36x36.png
rename to public/appicon/icon-36x36.png
diff --git a/public/icons/android/icon-48x48.png b/public/appicon/icon-48x48.png
similarity index 100%
rename from public/icons/android/icon-48x48.png
rename to public/appicon/icon-48x48.png
diff --git a/public/icons/apple/icon-57x57.png b/public/appicon/icon-57x57.png
similarity index 100%
rename from public/icons/apple/icon-57x57.png
rename to public/appicon/icon-57x57.png
diff --git a/public/icons/apple/icon-60x60.png b/public/appicon/icon-60x60.png
similarity index 100%
rename from public/icons/apple/icon-60x60.png
rename to public/appicon/icon-60x60.png
diff --git a/public/icons/android/icon-72x72.png b/public/appicon/icon-72x72.png
similarity index 100%
rename from public/icons/android/icon-72x72.png
rename to public/appicon/icon-72x72.png
diff --git a/public/icons/apple/icon-76x76.png b/public/appicon/icon-76x76.png
similarity index 100%
rename from public/icons/apple/icon-76x76.png
rename to public/appicon/icon-76x76.png
diff --git a/public/icons/android/icon-96x96.png b/public/appicon/icon-96x96.png
similarity index 100%
rename from public/icons/android/icon-96x96.png
rename to public/appicon/icon-96x96.png
diff --git a/public/icons/apple/icon-precomposed.png b/public/appicon/icon-precomposed.png
similarity index 100%
rename from public/icons/apple/icon-precomposed.png
rename to public/appicon/icon-precomposed.png
diff --git a/public/icons/apple/icon.png b/public/appicon/icon.png
similarity index 100%
rename from public/icons/apple/icon.png
rename to public/appicon/icon.png
diff --git a/public/icons/favicon-16x16.png b/public/favicon-16x16.png
similarity index 100%
rename from public/icons/favicon-16x16.png
rename to public/favicon-16x16.png
diff --git a/public/icons/favicon-32x32.png b/public/favicon-32x32.png
similarity index 100%
rename from public/icons/favicon-32x32.png
rename to public/favicon-32x32.png
diff --git a/public/icons/favicon-96x96.png b/public/favicon-96x96.png
similarity index 100%
rename from public/icons/favicon-96x96.png
rename to public/favicon-96x96.png
diff --git a/public/icons/favicon.ico b/public/favicon.ico
similarity index 100%
rename from public/icons/favicon.ico
rename to public/favicon.ico
diff --git a/public/icons/android/icon-192x192.png b/public/icons/android/icon-192x192.png
deleted file mode 100644
index 7408263..0000000
Binary files a/public/icons/android/icon-192x192.png and /dev/null differ
diff --git a/public/icons/apple/icon-144x144.png b/public/icons/apple/icon-144x144.png
deleted file mode 100644
index 187c044..0000000
Binary files a/public/icons/apple/icon-144x144.png and /dev/null differ
diff --git a/public/icons/apple/icon-72x72.png b/public/icons/apple/icon-72x72.png
deleted file mode 100644
index 2367d35..0000000
Binary files a/public/icons/apple/icon-72x72.png and /dev/null differ
diff --git a/public/icons/microsoft/icon-144x144.png b/public/icons/microsoft/icon-144x144.png
deleted file mode 100644
index 187c044..0000000
Binary files a/public/icons/microsoft/icon-144x144.png and /dev/null differ
diff --git a/public/icons/microsoft/icon-150x150.png b/public/icons/microsoft/icon-150x150.png
deleted file mode 100644
index 8a201b6..0000000
Binary files a/public/icons/microsoft/icon-150x150.png and /dev/null differ
diff --git a/public/icons/microsoft/icon-310x310.png b/public/icons/microsoft/icon-310x310.png
deleted file mode 100644
index 8cd49de..0000000
Binary files a/public/icons/microsoft/icon-310x310.png and /dev/null differ
diff --git a/public/icons/microsoft/icon-70x70.png b/public/icons/microsoft/icon-70x70.png
deleted file mode 100644
index 932a057..0000000
Binary files a/public/icons/microsoft/icon-70x70.png and /dev/null differ
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index c41caea..aa33493 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -39,68 +39,68 @@ export const metadata: Metadata = {
   },
   icons: {
     icon: [
-      { url: '/icons/favicon.ico', type: 'image/x-icon', sizes: 'any' },
-      { url: '/icons/favicon-16x16.png', type: 'image/png', sizes: '16x16'},
-      { url: '/icons/favicon-32x32.png', type: 'image/png', sizes: '32x32'},
-      { url: '/icons/favicon-96x96.png', type: 'image/png', sizes: '96x96'},
-      { url: '/icons/favicon.ico', type: 'image/x-icon', sizes: 'any', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/favicon-16x16.png', type: 'image/png', sizes: '16x16', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/favicon-32x32.png', type: 'image/png', sizes: '32x32', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/favicon-96x96.png', type: 'image/png', sizes: '96x96', media: '(prefers-color-scheme: dark)' },
+      { url: '/favicon.ico', type: 'image/x-icon', sizes: 'any' },
+      { url: '/favicon-16x16.png', type: 'image/png', sizes: '16x16'},
+      { url: '/favicon-32x32.png', type: 'image/png', sizes: '32x32'},
+      { url: '/favicon-96x96.png', type: 'image/png', sizes: '96x96'},
+      { url: '/favicon.ico', type: 'image/x-icon', sizes: 'any', media: '(prefers-color-scheme: dark)' },
+      { url: '/favicon-16x16.png', type: 'image/png', sizes: '16x16', media: '(prefers-color-scheme: dark)' },
+      { url: '/favicon-32x32.png', type: 'image/png', sizes: '32x32', media: '(prefers-color-scheme: dark)' },
+      { url: '/favicon-96x96.png', type: 'image/png', sizes: '96x96', media: '(prefers-color-scheme: dark)' },
 
-      { url: '/icons/android/icon-36x36', type: 'image/png', sizes: '36x36'},
-      { url: '/icons/android/icon-48x48', type: 'image/png', sizes: '48x48'},
-      { url: '/icons/android/icon-72x72', type: 'image/png', sizes: '72x72'},
-      { url: '/icons/android/icon-96x96', type: 'image/png', sizes: '96x96'},
-      { url: '/icons/android/icon-144x144', type: 'image/png', sizes: '144x144'},
-      { url: '/icons/android/icon-192x192', type: 'image/png', sizes: '192x192'},
-      { url: '/icons/android/icon-36x36', type: 'image/png', sizes: '36x36', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-48x48', type: 'image/png', sizes: '48x48', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-72x72', type: 'image/png', sizes: '72x72', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-96x96', type: 'image/png', sizes: '96x96', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-144x144', type: 'image/png', sizes: '144x144', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-192x192', type: 'image/png', sizes: '192x192', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-36x36.png', type: 'image/png', sizes: '36x36'},
+      { url: '/appicon/icon-48x48.png', type: 'image/png', sizes: '48x48'},
+      { url: '/appicon/icon-72x72.png', type: 'image/png', sizes: '72x72'},
+      { url: '/appicon/icon-96x96.png', type: 'image/png', sizes: '96x96'},
+      { url: '/appicon/icon-144x144.png', type: 'image/png', sizes: '144x144'},
+      { url: '/appicon/icon.png', type: 'image/png', sizes: '192x192'},
+      { url: '/appicon/icon-36x36.png', type: 'image/png', sizes: '36x36', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-48x48.png', type: 'image/png', sizes: '48x48', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-72x72.png', type: 'image/png', sizes: '72x72', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-96x96.png', type: 'image/png', sizes: '96x96', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-144x144.png', type: 'image/png', sizes: '144x144', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon.png', type: 'image/png', sizes: '192x192', media: '(prefers-color-scheme: dark)' },
     ],
     shortcut: [
-      { url: '/icons/android/icon-36x36', type: 'image/png', sizes: '36x36'},
-      { url: '/icons/android/icon-48x48', type: 'image/png', sizes: '48x48'},
-      { url: '/icons/android/icon-72x72', type: 'image/png', sizes: '72x72'},
-      { url: '/icons/android/icon-96x96', type: 'image/png', sizes: '96x96'},
-      { url: '/icons/android/icon-144x144', type: 'image/png', sizes: '144x144'},
-      { url: '/icons/android/icon-192x192', type: 'image/png', sizes: '192x192'},
-      { url: '/icons/android/icon-36x36', type: 'image/png', sizes: '36x36', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-48x48', type: 'image/png', sizes: '48x48', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-72x72', type: 'image/png', sizes: '72x72', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-96x96', type: 'image/png', sizes: '96x96', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-144x144', type: 'image/png', sizes: '144x144', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/android/icon-192x192', type: 'image/png', sizes: '192x192', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-36x36.png', type: 'image/png', sizes: '36x36'},
+      { url: '/appicon/icon-48x48.png', type: 'image/png', sizes: '48x48'},
+      { url: '/appicon/icon-72x72.png', type: 'image/png', sizes: '72x72'},
+      { url: '/appicon/icon-96x96.png', type: 'image/png', sizes: '96x96'},
+      { url: '/appicon/icon-144x144.png', type: 'image/png', sizes: '144x144'},
+      { url: '/appicon/icon-192x192.png', type: 'image/png', sizes: '192x192'},
+      { url: '/appicon/icon-36x36.png', type: 'image/png', sizes: '36x36', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-48x48.png', type: 'image/png', sizes: '48x48', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-72x72.png', type: 'image/png', sizes: '72x72', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-96x96.png', type: 'image/png', sizes: '96x96', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon-144x144.png', type: 'image/png', sizes: '144x144', media: '(prefers-color-scheme: dark)' },
+      { url: '/appicon/icon.png', type: 'image/png', sizes: '192x192', media: '(prefers-color-scheme: dark)' },
     ],
     apple: [
-      { url: '/icons/apple/icon.png', type: 'image/png', sizes: '192x192' },
-      { url: '/icons/apple/icon-57x57.png', type: 'image/png', sizes: '57x57' },
-      { url: '/icons/apple/icon-60x60.png', type: 'image/png', sizes: '60x60' },
-      { url: '/icons/apple/icon-72x72.png', type: 'image/png', sizes: '72x72' },
-      { url: '/icons/apple/icon-76x76.png', type: 'image/png', sizes: '76x76' },
-      { url: '/icons/apple/icon-114x114.png', type: 'image/png', sizes: '114x114' },
-      { url: '/icons/apple/icon-120x120.png', type: 'image/png', sizes: '120x120' },
-      { url: '/icons/apple/icon-144x144.png', type: 'image/png', sizes: '144x144' },
-      { url: '/icons/apple/icon-152x152.png', type: 'image/png', sizes: '152x152' },
-      { url: '/icons/apple/icon-180x180.png', type: 'image/png', sizes: '180x180' },
-      { url: '/icons/apple/icon.png', type: 'image/png', sizes: '192x192', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-57x57.png', type: 'image/png', sizes: '57x57', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-60x60.png', type: 'image/png', sizes: '60x60', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-72x72.png', type: 'image/png', sizes: '72x72', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-76x76.png', type: 'image/png', sizes: '76x76', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-114x114.png', type: 'image/png', sizes: '114x114', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-120x120.png', type: 'image/png', sizes: '120x120', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-144x144.png', type: 'image/png', sizes: '144x144', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-152x152.png', type: 'image/png', sizes: '152x152', media: '(prefers-color-scheme: dark)' },
-      { url: '/icons/apple/icon-180x180.png', type: 'image/png', sizes: '180x180', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-57x57.png', type: 'image/png', sizes: '57x57' },
+      { url: 'appicon/icon-60x60.png', type: 'image/png', sizes: '60x60' },
+      { url: 'appicon/icon-72x72.png', type: 'image/png', sizes: '72x72' },
+      { url: 'appicon/icon-76x76.png', type: 'image/png', sizes: '76x76' },
+      { url: 'appicon/icon-114x114.png', type: 'image/png', sizes: '114x114' },
+      { url: 'appicon/icon-120x120.png', type: 'image/png', sizes: '120x120' },
+      { url: 'appicon/icon-144x144.png', type: 'image/png', sizes: '144x144' },
+      { url: 'appicon/icon-152x152.png', type: 'image/png', sizes: '152x152' },
+      { url: 'appicon/icon-180x180.png', type: 'image/png', sizes: '180x180' },
+      { url: 'appicon/icon.png', type: 'image/png', sizes: '192x192' },
+      { url: 'appicon/icon-57x57.png', type: 'image/png', sizes: '57x57', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-60x60.png', type: 'image/png', sizes: '60x60', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-72x72.png', type: 'image/png', sizes: '72x72', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-76x76.png', type: 'image/png', sizes: '76x76', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-114x114.png', type: 'image/png', sizes: '114x114', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-120x120.png', type: 'image/png', sizes: '120x120', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-144x144.png', type: 'image/png', sizes: '144x144', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-152x152.png', type: 'image/png', sizes: '152x152', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon-180x180.png', type: 'image/png', sizes: '180x180', media: '(prefers-color-scheme: dark)' },
+      { url: 'appicon/icon.png', type: 'image/png', sizes: '192x192', media: '(prefers-color-scheme: dark)' },
     ],
     other: [
       {
         rel: 'apple-touch-icon-precomposed',
-        url: '/icons/apple/icon-precomposed.png',
+        url: '/appicon/icon-precomposed.png',
         type: 'image/png',
         sizes: '180x180'
       },