diff --git a/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte b/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte
index 98ec0948e..3b8387df8 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte
@@ -198,12 +198,15 @@ onDestroy(() => {
         </div>
     </Drawer>
 
-    <Button.Nav href="/scan-qr">
+    <Button.Nav
+        href="/scan-qr"
+        class="fixed bottom-12 left-1/2 -translate-x-1/2"
+    >
         <Button.Action
             variant="solid"
-            size="sm"
+            size="md"
             onclick={() => alert("Action button clicked!")}
-            class="mx-auto text-nowrap flex gap-8 fixed bottom-5 left-1/2 -translate-x-1/2 z-10"
+            class="mx-auto text-nowrap flex gap-8"
         >
             <HugeiconsIcon
                 size={32}
diff --git a/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte b/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
index 8dff1c999..47462eba3 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
@@ -57,7 +57,7 @@ onMount(() => {
 </script>
 
 <main
-    class="h-[85vh] pt-[4svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between"
+    class="h-[85vh] pt-[4svh] px-[5vw] pb-[8svh] flex flex-col justify-between"
 >
     <section>
         <div>
@@ -83,9 +83,9 @@ onMount(() => {
 
 <Drawer bind:isPaneOpen={showDrawer}>
     <div
-        class="relative bg-gray w-[72px] h-[72px] rounded-[24px] flex justify-center items-center mb-[2.3svh]"
+        class="relative bg-gray w-18 h-18 rounded-3xl flex justify-center items-center mb-[2.3svh]"
     >
-        <span class="relative z-[1]">
+        <span class="relative z-1">
             <HugeiconsIcon
                 icon={CircleLock01Icon}
                 color="var(--color-primary)"
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte
index f605a7cce..252ba6446 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte
@@ -238,9 +238,7 @@ onMount(async () => {
 });
 </script>
 
-<main
-    class="h-full pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between"
->
+<main class="h-full pt-[5.2svh] px-[5vw] flex flex-col justify-between">
     <section>
         <Hero title="Log in to your account" class="mb-4">
             {#snippet subtitle()}
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
index a949e3b93..3d00d7877 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
@@ -336,7 +336,7 @@ onMount(async () => {
             </ButtonAction>
         </div>
 
-        <p class="mt-2 text-center">
+        <p class="mt-2 text-center pb-12">
             Already have a pre-verification code? <button
                 onclick={handlePreVerified}
                 class="text-primary-500">Click Here</button
@@ -440,7 +440,7 @@ onMount(async () => {
                 {/if}
             </article>
 
-            <div class="flex-none pt-8 pb-4">
+            <div class="flex-none pt-8 pb-12">
                 {#if !loading && !checkingHardware}
                     <div class="flex w-full items-stretch gap-3">
                         <div class="flex-1">
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte
index c00e6c925..22be29798 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte
@@ -101,7 +101,7 @@ onMount(async () => {
 </script>
 
 <main
-    class="h-full pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between"
+    class="h-full pt-[5.2svh] px-[5vw] pb-[8svh] flex flex-col justify-between"
 >
     <section>
         {#if currentStep === "CREATE"}
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte
index be64bf8cb..0836f6db5 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte
@@ -20,7 +20,7 @@ onMount(async () => {
 </script>
 
 <main
-    class="h-full pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between"
+    class="h-full pt-[5.2svh] px-[5vw] pb-[8svh] flex flex-col justify-between"
 >
     <section>
         <Hero title="Here’s your eName" class="mb-4">
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
index beec2660b..50a8e7a6a 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
@@ -453,7 +453,7 @@ onDestroy(() => {
                 {/if}
             </div>
 
-            <div class="flex-none px-[5vw] pb-[4.5svh] pt-4">
+            <div class="flex-none px-[5vw] pb-[8svh] pt-4">
                 {#if !loading}
                     <div class="flex w-full items-stretch gap-3">
                         <ButtonAction
diff --git a/infrastructure/eid-wallet/src/routes/+layout.svelte b/infrastructure/eid-wallet/src/routes/+layout.svelte
index e98e2f24b..daee8db3b 100644
--- a/infrastructure/eid-wallet/src/routes/+layout.svelte
+++ b/infrastructure/eid-wallet/src/routes/+layout.svelte
@@ -681,7 +681,7 @@ $effect(() => {
     ></div>
     <div
         bind:this={mainWrapper}
-        class="bg-white h-screen overflow-scroll pt-10"
+        class="bg-white h-screen overflow-scroll py-10"
     >
         {#if children}
             {@render children()}