diff --git a/src/lib/components/FooterNav.svelte b/src/lib/components/FooterNav.svelte
index e636bb4123..55c8231409 100644
--- a/src/lib/components/FooterNav.svelte
+++ b/src/lib/components/FooterNav.svelte
@@ -15,7 +15,7 @@
 </script>
 
 <nav class="aw-footer-nav u-margin-block-start-100 u-position-relative aw-u-sep-block-start">
-	<img class="aw-logo" src="/images/logos/appwrite.svg" alt="appwrite" width="130" />
+	<img class="aw-logo" src="/images/logos/appwrite.svg" alt="appwrite" height="24" width="130" />
 	<ul class="aw-footer-nav-main-list">
 		<li class="aw-footer-nav-main-item">
 			<h5 class="aw-footer-nav-main-title aw-is-not-mobile aw-caption-500 aw-eyebrow">
diff --git a/src/lib/layouts/Docs.svelte b/src/lib/layouts/Docs.svelte
index 65ea08cab7..68611dd310 100644
--- a/src/lib/layouts/Docs.svelte
+++ b/src/lib/layouts/Docs.svelte
@@ -77,13 +77,13 @@
 						class="aw-logo u-only-dark"
 						src="/images/logos/appwrite.svg"
 						alt="appwrite"
-						width="130"
+						height="24" width="130"
 					/>
 					<img
 						class="aw-logo u-only-light"
 						src="/images/logos/appwrite-light.svg"
 						alt="appwrite"
-						width="130"
+						height="24" width="130"
 					/>
 				</a>
 			</div>
@@ -114,13 +114,13 @@
 								class="aw-logo u-only-dark"
 								src="/images/logos/appwrite.svg"
 								alt="appwrite"
-								width="130"
+								height="24" width="130"
 							/>
 							<img
 								class="aw-logo u-only-light"
 								src="/images/logos/appwrite-light.svg"
 								alt="appwrite"
-								width="130"
+								height="24" width="130"
 							/>
 						</a>
 						<nav class="aw-main-header-nav">
diff --git a/src/lib/layouts/Main.svelte b/src/lib/layouts/Main.svelte
index 1914f5a931..a498944429 100644
--- a/src/lib/layouts/Main.svelte
+++ b/src/lib/layouts/Main.svelte
@@ -123,13 +123,13 @@
 					class="aw-logo aw-u-only-dark"
 					src="/images/logos/appwrite.svg"
 					alt="appwrite"
-					width="130"
+					height="24" width="130"
 				/>
 				<img
 					class="aw-logo aw-u-only-light"
 					src="/images/logos/appwrite-light.svg"
 					alt="appwrite"
-					width="130"
+					height="24" width="130"
 				/>
 			</a>
 		</div>
@@ -177,13 +177,13 @@
 								class="aw-logo aw-u-only-dark"
 								src="/images/logos/appwrite.svg"
 								alt="appwrite"
-								width="130"
+								height="24" width="130"
 							/>
 							<img
 								class="aw-logo aw-u-only-light"
 								src="/images/logos/appwrite-light.svg"
 								alt="appwrite"
-								width="130"
+								height="24" width="130"
 							/>
 						</a>
 						<nav class="aw-main-header-nav">
diff --git a/src/markdoc/tags/Icon_Image.svelte b/src/markdoc/tags/Icon_Image.svelte
index 7541e740e5..38ef48adb9 100644
--- a/src/markdoc/tags/Icon_Image.svelte
+++ b/src/markdoc/tags/Icon_Image.svelte
@@ -1,14 +1,22 @@
 <script lang="ts">
-	export let src: string;
-	export let alt: string;
-	export let size: string = 's';
+    export let src: string;
+    export let alt: string;
+    export let size: string = 's';
 
-	const sizes: Record<string, string> = {
-		s: '16px',
+    const sizes: Record<string, string> = {
+        s: '16px',
         m: '20px',
-		l: '32px',
-		xl: '40px'
-	};
+        l: '32px',
+        xl: '40px'
+    };
 </script>
 
-<img {src} {alt} loading="lazy" style:width={sizes[size]} style:vertical-align="middle" />
+<img
+    {src}
+    {alt}
+    loading="lazy"
+    width={sizes[size]}
+    height={sizes[size]}
+    style:width={sizes[size]}
+    style:vertical-align="middle"
+/>
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
new file mode 100644
index 0000000000..189f71e2e1
--- /dev/null
+++ b/src/routes/+layout.server.ts
@@ -0,0 +1 @@
+export const prerender = true;
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
deleted file mode 100644
index c8cacf0895..0000000000
--- a/src/routes/+layout.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const prerender = true;
\ No newline at end of file
diff --git a/src/scss/1-css-variables/_fonts.scss b/src/scss/1-css-variables/_fonts.scss
index cfb175fd8d..25d8fde17f 100644
--- a/src/scss/1-css-variables/_fonts.scss
+++ b/src/scss/1-css-variables/_fonts.scss
@@ -1,6 +1,6 @@
 @use '../abstract' as *;
 :root {
-  --aw-font-family-aeonik-pro: 'Aeonik Pro', 'Poppins', arial, sans-serif;
+  --aw-font-family-aeonik-pro: 'Aeonik Pro', arial, sans-serif;
   --aw-font-family-inter: 'Inter', arial, sans-serif;
   --aw-font-family-aeonik-fono: 'Aenoik Fono', monospace;
 }
diff --git a/src/scss/3-fonts/_aeonik-fono.scss b/src/scss/3-fonts/_aeonik-fono.scss
index 62f9918389..5e0f015862 100644
--- a/src/scss/3-fonts/_aeonik-fono.scss
+++ b/src/scss/3-fonts/_aeonik-fono.scss
@@ -3,6 +3,7 @@
   font-family: 'Aenoik Fono';
   font-style: normal;
   font-weight: 100;
+  font-display: swap;
   src: local('Aeonik Fono'), local('AeonikFono'), url('/fonts/aeonik-fono/AeonikFono-Air.woff2') format('woff2');
 }
 
@@ -10,6 +11,7 @@
   font-family: 'Aenoik Fono';
   font-style: normal;
   font-weight: 200;
+  font-display: swap;
   src: local('Aeonik Fono'), local('AeonikFono'), url('/fonts/aeonik-fono/AeonikFono-Thin.woff2') format('woff2');
 }
 
@@ -17,6 +19,7 @@
   font-family: 'Aenoik Fono';
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: local('Aeonik Fono'), local('AeonikFono'), url('/fonts/aeonik-fono/AeonikFono-Light.woff2') format('woff2');
 }
 
@@ -24,6 +27,7 @@
   font-family: 'Aenoik Fono';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src: local('Aeonik Fono'), local('AeonikFono'), url('/fonts/aeonik-fono/AeonikFono-Regular.woff2') format('woff2');
 }
 
@@ -31,6 +35,7 @@
   font-family: 'Aenoik Fono';
   font-style: normal;
   font-weight: 500;
+  font-display: swap;
   src: local('Aeonik Fono'), local('AeonikFono'), url('/fonts/aeonik-fono/AeonikFono-Medium.woff2') format('woff2');
 }
 
@@ -38,6 +43,7 @@
   font-family: 'Aenoik Fono';
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src: local('Aeonik Fono'), local('AeonikFono'), url('/fonts/aeonik-fono/AeonikFono-Bold.woff2') format('woff2');
 }
 
@@ -45,5 +51,6 @@
   font-family: 'Aenoik Fono';
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: local('Aeonik Fono'), local('AeonikFono'), url('/fonts/aeonik-fono/AeonikFono-Black.woff2') format('woff2');
 }
\ No newline at end of file
diff --git a/src/scss/3-fonts/_aeonik-pro.scss b/src/scss/3-fonts/_aeonik-pro.scss
index e2fe80fb6d..579c176c84 100644
--- a/src/scss/3-fonts/_aeonik-pro.scss
+++ b/src/scss/3-fonts/_aeonik-pro.scss
@@ -4,6 +4,7 @@
   font-family: 'Aeonik Pro';
   font-style: normal;
   font-weight: 100;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-Air.woff2') format('woff2');
 }
 
@@ -11,6 +12,7 @@
   font-family: 'Aeonik Pro';
   font-style: italic;
   font-weight: 100;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-AirItalic.woff2') format('woff2');
 }
 ///
@@ -18,6 +20,7 @@
   font-family: 'Aeonik Pro';
   font-style: normal;
   font-weight: 200;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-Thin.woff2') format('woff2');
 }
 
@@ -25,14 +28,15 @@
   font-family: 'Aeonik Pro';
   font-style: italic;
   font-weight: 200;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-ThinItalic.woff2') format('woff2');
 }
 ///
-///
 @font-face {
   font-family: 'Aeonik Pro';
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-Light.woff2') format('woff2');
 }
 
@@ -40,6 +44,7 @@
   font-family: 'Aeonik Pro';
   font-style: italic;
   font-weight: 300;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-LightItalic.woff2') format('woff2');
 }
 ///
@@ -47,6 +52,7 @@
   font-family: 'Aeonik Pro';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-Regular.woff2') format('woff2');
 }
 
@@ -54,6 +60,7 @@
   font-family: 'Aeonik Pro';
   font-style: italic;
   font-weight: 400;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-RegularItalic.woff2') format('woff2');
 }
 ///
@@ -61,6 +68,7 @@
   font-family: 'Aeonik Pro';
   font-style: normal;
   font-weight: 500;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-Medium.woff2') format('woff2');
 }
 
@@ -68,6 +76,7 @@
   font-family: 'Aeonik Pro';
   font-style: italic;
   font-weight: 500;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-MediumItalic.woff2') format('woff2');
 }
 ///
@@ -75,6 +84,7 @@
   font-family: 'Aeonik Pro';
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-Bold.woff2') format('woff2');
 }
 
@@ -82,6 +92,7 @@
   font-family: 'Aeonik Pro';
   font-style: italic;
   font-weight: 600;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-BoldItalic.woff2') format('woff2');
 }
 ///
@@ -89,6 +100,7 @@
   font-family: 'Aeonik Pro';
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-Black.woff2') format('woff2');
 }
 
@@ -96,6 +108,7 @@
   font-family: 'Aeonik Pro';
   font-style: italic;
   font-weight: 700;
+  font-display: swap;
   src: local('Aeonik Pro'), local('AeonikPro'), url('/fonts/aeonik-pro/AeonikPro-BlackItalic.woff2') format('woff2');
 }
 ///
\ No newline at end of file
diff --git a/src/scss/3-fonts/_inter.scss b/src/scss/3-fonts/_inter.scss
index b86bcede1e..2460992b63 100644
--- a/src/scss/3-fonts/_inter.scss
+++ b/src/scss/3-fonts/_inter.scss
@@ -4,53 +4,62 @@
   font-family: 'Inter';
   font-style: normal;
   font-weight: 100;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-100-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 200;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-200-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-300-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-400-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 500;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-500-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-600-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-700-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 800;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-800-normal.woff2') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 900;
+  font-display: swap;
   src: url('/fonts/inter/inter-latin-900-normal.woff2') format('woff2');
 }