diff --git a/public/appicon/icon-114x114.png b/public/appicon/icon-114.png
similarity index 100%
rename from public/appicon/icon-114x114.png
rename to public/appicon/icon-114.png
diff --git a/public/appicon/icon-120x120.png b/public/appicon/icon-120.png
similarity index 100%
rename from public/appicon/icon-120x120.png
rename to public/appicon/icon-120.png
diff --git a/public/appicon/icon-144x144.png b/public/appicon/icon-144.png
similarity index 100%
rename from public/appicon/icon-144x144.png
rename to public/appicon/icon-144.png
diff --git a/public/appicon/icon-152x152.png b/public/appicon/icon-152.png
similarity index 100%
rename from public/appicon/icon-152x152.png
rename to public/appicon/icon-152.png
diff --git a/public/appicon/icon-180x180.png b/public/appicon/icon-180.png
similarity index 100%
rename from public/appicon/icon-180x180.png
rename to public/appicon/icon-180.png
diff --git a/public/appicon/icon-36x36.png b/public/appicon/icon-36.png
similarity index 100%
rename from public/appicon/icon-36x36.png
rename to public/appicon/icon-36.png
diff --git a/public/appicon/icon-48x48.png b/public/appicon/icon-48.png
similarity index 100%
rename from public/appicon/icon-48x48.png
rename to public/appicon/icon-48.png
diff --git a/public/appicon/icon-57x57.png b/public/appicon/icon-57.png
similarity index 100%
rename from public/appicon/icon-57x57.png
rename to public/appicon/icon-57.png
diff --git a/public/appicon/icon-60x60.png b/public/appicon/icon-60.png
similarity index 100%
rename from public/appicon/icon-60x60.png
rename to public/appicon/icon-60.png
diff --git a/public/appicon/icon-72x72.png b/public/appicon/icon-72.png
similarity index 100%
rename from public/appicon/icon-72x72.png
rename to public/appicon/icon-72.png
diff --git a/public/appicon/icon-76x76.png b/public/appicon/icon-76.png
similarity index 100%
rename from public/appicon/icon-76x76.png
rename to public/appicon/icon-76.png
diff --git a/public/appicon/icon-96x96.png b/public/appicon/icon-96.png
similarity index 100%
rename from public/appicon/icon-96x96.png
rename to public/appicon/icon-96.png
diff --git a/public/favicon-16x16.png b/public/favicon-16.png
similarity index 100%
rename from public/favicon-16x16.png
rename to public/favicon-16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32.png
similarity index 100%
rename from public/favicon-32x32.png
rename to public/favicon-32.png
diff --git a/public/favicon.ico b/public/favicon.ico
index a1042d4..d871d88 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/icons/apple.svg b/public/icons/auth/apple.svg
similarity index 100%
rename from public/icons/apple.svg
rename to public/icons/auth/apple.svg
diff --git a/public/icons/microsoft.svg b/public/icons/auth/microsoft.svg
similarity index 100%
rename from public/icons/microsoft.svg
rename to public/icons/auth/microsoft.svg
diff --git a/public/icons/gitea.svg b/public/icons/misc/gitea.svg
similarity index 100%
rename from public/icons/gitea.svg
rename to public/icons/misc/gitea.svg
diff --git a/public/temp/favicon.ico b/public/temp/favicon.ico
new file mode 100644
index 0000000..a1042d4
Binary files /dev/null and b/public/temp/favicon.ico differ
diff --git a/src/app/(auth-pages)/forgot-password/layout.tsx b/src/app/(auth-pages)/forgot-password/layout.tsx
new file mode 100644
index 0000000..98acc0f
--- /dev/null
+++ b/src/app/(auth-pages)/forgot-password/layout.tsx
@@ -0,0 +1,16 @@
+import type { Metadata } from 'next';
+
+export const generateMetadata = (): Metadata => {
+  return {
+    title: 'Forgot Password'
+  };
+};
+
+const ForgotPasswordLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
+    return (
+      <div>
+        {children}
+      </div>
+    );
+  };
+export default ForgotPasswordLayout;
diff --git a/src/app/(auth-pages)/profile/layout.tsx b/src/app/(auth-pages)/profile/layout.tsx
new file mode 100644
index 0000000..a4623b4
--- /dev/null
+++ b/src/app/(auth-pages)/profile/layout.tsx
@@ -0,0 +1,16 @@
+import type { Metadata } from 'next';
+
+export const generateMetadata = (): Metadata => {
+  return {
+    title: 'Profile'
+  };
+};
+
+const ProfileLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
+    return (
+      <div>
+        {children}
+      </div>
+    );
+  };
+export default ProfileLayout;
diff --git a/src/app/(auth-pages)/sign-in/layout.tsx b/src/app/(auth-pages)/sign-in/layout.tsx
new file mode 100644
index 0000000..89bd917
--- /dev/null
+++ b/src/app/(auth-pages)/sign-in/layout.tsx
@@ -0,0 +1,16 @@
+import type { Metadata } from 'next';
+
+export const generateMetadata = (): Metadata => {
+  return {
+    title: 'Sign In'
+  };
+};
+
+const SignInLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
+    return (
+      <div>
+        {children}
+      </div>
+    );
+  };
+export default SignInLayout;
diff --git a/src/app/(auth-pages)/sign-up/layout.tsx b/src/app/(auth-pages)/sign-up/layout.tsx
new file mode 100644
index 0000000..bc0280e
--- /dev/null
+++ b/src/app/(auth-pages)/sign-up/layout.tsx
@@ -0,0 +1,16 @@
+import type { Metadata } from 'next';
+
+export const generateMetadata = (): Metadata => {
+  return {
+    title: 'Sign Up'
+  };
+};
+
+const SignUpLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
+    return (
+      <div>
+        {children}
+      </div>
+    );
+  };
+export default SignUpLayout;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
old mode 100644
new mode 100755
index cb3c29b..772f232
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -51,12 +51,12 @@ export const generateMetadata = (): Metadata => {
       icon: [
         { url: '/favicon.ico', type: 'image/x-icon', sizes: 'any' },
         {
-          url: '/favicon-16x16.png',
+          url: '/favicon-16.png',
           type: 'image/png',
           sizes: '16x16',
         },
         {
-          url: '/favicon-32x32.png',
+          url: '/favicon-32.png',
           type: 'image/png',
           sizes: '32x32',
         },
@@ -68,46 +68,45 @@ export const generateMetadata = (): Metadata => {
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/favicon-16x16.png',
+          url: '/favicon-16.png',
           type: 'image/png',
           sizes: '16x16',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/favicon-32x32.png',
+          url: '/favicon-32.png',
           type: 'image/png',
           sizes: '32x32',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/favicon-96x96.png',
+          url: '/favicon.png',
           type: 'image/png',
           sizes: '96x96',
           media: '(prefers-color-scheme: dark)',
         },
-
         {
-          url: '/appicon/icon-36x36.png',
+          url: '/appicon/icon-36.png',
           type: 'image/png',
           sizes: '36x36',
         },
         {
-          url: '/appicon/icon-48x48.png',
+          url: '/appicon/icon-48.png',
           type: 'image/png',
           sizes: '48x48',
         },
         {
-          url: '/appicon/icon-72x72.png',
+          url: '/appicon/icon-72.png',
           type: 'image/png',
           sizes: '72x72',
         },
         {
-          url: '/appicon/icon-96x96.png',
+          url: '/appicon/icon-96.png',
           type: 'image/png',
           sizes: '96x96',
         },
         {
-          url: '/appicon/icon-144x144.png',
+          url: '/appicon/icon-144.png',
           type: 'image/png',
           sizes: '144x144',
         },
@@ -117,31 +116,31 @@ export const generateMetadata = (): Metadata => {
           sizes: '192x192',
         },
         {
-          url: '/appicon/icon-36x36.png',
+          url: '/appicon/icon-36.png',
           type: 'image/png',
           sizes: '36x36',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-48x48.png',
+          url: '/appicon/icon-48.png',
           type: 'image/png',
           sizes: '48x48',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-72x72.png',
+          url: '/appicon/icon-72.png',
           type: 'image/png',
           sizes: '72x72',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-96x96.png',
+          url: '/appicon/icon-96.png',
           type: 'image/png',
           sizes: '96x96',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-144x144.png',
+          url: '/appicon/icon-144.png',
           type: 'image/png',
           sizes: '144x144',
           media: '(prefers-color-scheme: dark)',
@@ -155,27 +154,27 @@ export const generateMetadata = (): Metadata => {
       ],
       shortcut: [
         {
-          url: '/appicon/icon-36x36.png',
+          url: '/appicon/icon-36.png',
           type: 'image/png',
           sizes: '36x36',
         },
         {
-          url: '/appicon/icon-48x48.png',
+          url: '/appicon/icon-48.png',
           type: 'image/png',
           sizes: '48x48',
         },
         {
-          url: '/appicon/icon-72x72.png',
+          url: '/appicon/icon-72.png',
           type: 'image/png',
           sizes: '72x72',
         },
         {
-          url: '/appicon/icon-96x96.png',
+          url: '/appicon/icon-96.png',
           type: 'image/png',
           sizes: '96x96',
         },
         {
-          url: '/appicon/icon-144x144.png',
+          url: '/appicon/icon-144.png',
           type: 'image/png',
           sizes: '144x144',
         },
@@ -185,31 +184,31 @@ export const generateMetadata = (): Metadata => {
           sizes: '192x192',
         },
         {
-          url: '/appicon/icon-36x36.png',
+          url: '/appicon/icon-36.png',
           type: 'image/png',
           sizes: '36x36',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-48x48.png',
+          url: '/appicon/icon-48.png',
           type: 'image/png',
           sizes: '48x48',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-72x72.png',
+          url: '/appicon/icon-72.png',
           type: 'image/png',
           sizes: '72x72',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-96x96.png',
+          url: '/appicon/icon-96.png',
           type: 'image/png',
           sizes: '96x96',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: '/appicon/icon-144x144.png',
+          url: '/appicon/icon-144.png',
           type: 'image/png',
           sizes: '144x144',
           media: '(prefers-color-scheme: dark)',
@@ -223,47 +222,47 @@ export const generateMetadata = (): Metadata => {
       ],
       apple: [
         {
-          url: 'appicon/icon-57x57.png',
+          url: 'appicon/icon-57.png',
           type: 'image/png',
           sizes: '57x57',
         },
         {
-          url: 'appicon/icon-60x60.png',
+          url: 'appicon/icon-60.png',
           type: 'image/png',
           sizes: '60x60',
         },
         {
-          url: 'appicon/icon-72x72.png',
+          url: 'appicon/icon-72.png',
           type: 'image/png',
           sizes: '72x72',
         },
         {
-          url: 'appicon/icon-76x76.png',
+          url: 'appicon/icon-76.png',
           type: 'image/png',
           sizes: '76x76',
         },
         {
-          url: 'appicon/icon-114x114.png',
+          url: 'appicon/icon-114.png',
           type: 'image/png',
           sizes: '114x114',
         },
         {
-          url: 'appicon/icon-120x120.png',
+          url: 'appicon/icon-120.png',
           type: 'image/png',
           sizes: '120x120',
         },
         {
-          url: 'appicon/icon-144x144.png',
+          url: 'appicon/icon-144.png',
           type: 'image/png',
           sizes: '144x144',
         },
         {
-          url: 'appicon/icon-152x152.png',
+          url: 'appicon/icon-152.png',
           type: 'image/png',
           sizes: '152x152',
         },
         {
-          url: 'appicon/icon-180x180.png',
+          url: 'appicon/icon-180.png',
           type: 'image/png',
           sizes: '180x180',
         },
@@ -273,55 +272,55 @@ export const generateMetadata = (): Metadata => {
           sizes: '192x192',
         },
         {
-          url: 'appicon/icon-57x57.png',
+          url: 'appicon/icon-57.png',
           type: 'image/png',
           sizes: '57x57',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-60x60.png',
+          url: 'appicon/icon-60.png',
           type: 'image/png',
           sizes: '60x60',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-72x72.png',
+          url: 'appicon/icon-72.png',
           type: 'image/png',
           sizes: '72x72',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-76x76.png',
+          url: 'appicon/icon-76.png',
           type: 'image/png',
           sizes: '76x76',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-114x114.png',
+          url: 'appicon/icon-114.png',
           type: 'image/png',
           sizes: '114x114',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-120x120.png',
+          url: 'appicon/icon-120.png',
           type: 'image/png',
           sizes: '120x120',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-144x144.png',
+          url: 'appicon/icon-144.png',
           type: 'image/png',
           sizes: '144x144',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-152x152.png',
+          url: 'appicon/icon-152.png',
           type: 'image/png',
           sizes: '152x152',
           media: '(prefers-color-scheme: dark)',
         },
         {
-          url: 'appicon/icon-180x180.png',
+          url: 'appicon/icon-180.png',
           type: 'image/png',
           sizes: '180x180',
           media: '(prefers-color-scheme: dark)',
diff --git a/src/app/status/layout.tsx b/src/app/status/layout.tsx
new file mode 100644
index 0000000..570642b
--- /dev/null
+++ b/src/app/status/layout.tsx
@@ -0,0 +1,16 @@
+import type { Metadata } from 'next';
+
+export const generateMetadata = (): Metadata => {
+  return {
+    title: 'Status Table'
+  };
+};
+
+const StatusLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
+    return (
+      <div>
+        {children}
+      </div>
+    );
+  };
+export default StatusLayout;
diff --git a/src/components/default/auth/buttons/SignInWithApple.tsx b/src/components/default/auth/buttons/SignInWithApple.tsx
index ebf3b8e..306b856 100644
--- a/src/components/default/auth/buttons/SignInWithApple.tsx
+++ b/src/components/default/auth/buttons/SignInWithApple.tsx
@@ -62,7 +62,7 @@ export const SignInWithApple = ({
       >
         <div className='flex items-center gap-2'>
           <Image
-            src='/icons/apple.svg'
+            src='/icons/auth/apple.svg'
             alt='Apple logo'
             className='invert-75 dark:invert-25'
             width={22}
diff --git a/src/components/default/auth/buttons/SignInWithMicrosoft.tsx b/src/components/default/auth/buttons/SignInWithMicrosoft.tsx
index df3fbfa..3c6e61e 100644
--- a/src/components/default/auth/buttons/SignInWithMicrosoft.tsx
+++ b/src/components/default/auth/buttons/SignInWithMicrosoft.tsx
@@ -56,7 +56,7 @@ export const SignInWithMicrosoft = ({
       >
         <div className='flex items-center gap-2'>
           <Image
-            src='/icons/microsoft.svg'
+            src='/icons/auth/microsoft.svg'
             alt='Microsoft logo'
             width={20}
             height={20}
diff --git a/src/components/default/footer/index.tsx b/src/components/default/footer/index.tsx
index 372b6d9..2a9fd38 100644
--- a/src/components/default/footer/index.tsx
+++ b/src/components/default/footer/index.tsx
@@ -14,7 +14,7 @@ const Footer = () => {
 						hover:bg-gradient-to-tr hover:from-[#35363F] hover:to-[#23242F]
 						flex items-center gap-2 transition-all duration-200'
         >
-          <Image src='/icons/gitea.svg' alt='Gitea' width={20} height={20} />
+          <Image src='/icons/misc/gitea.svg' alt='Gitea' width={20} height={20} />
           <span className='text-white'>View Source Code on Gitea</span>
         </Link>
       </div>