diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/.gitignore b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml
new file mode 100644
index 00000000..4a53bee8
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/appInsightsSettings.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/appInsightsSettings.xml
new file mode 100644
index 00000000..6bbe2aee
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/appInsightsSettings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Android Vitals" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/compiler.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/compiler.xml
new file mode 100644
index 00000000..b86273d9
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="21" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..a24fc0d8
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-05-02T03:58:53.422245180Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/gourav/.android/avd/Pixel_3a_API_34.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml
new file mode 100644
index 00000000..1b7f23c6
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
+                <projects>
+                  <project path="$PROJECT_DIR$/buildSrc" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-2.3.1/mobile/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-plugin-barcode-scanner-2.2.0/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-plugin-biometric-2.2.0/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-plugin-opener-2.2.6/android" />
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/buildSrc" />
+          </set>
+        </option>
+        <option name="resolveExternalAnnotations" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/kotlinc.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/kotlinc.xml
new file mode 100644
index 00000000..4cb74572
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.9.25" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/migrations.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/migrations.xml
new file mode 100644
index 00000000..f8051a6f
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/misc.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/misc.xml
new file mode 100644
index 00000000..b2c751a3
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/misc.xml
@@ -0,0 +1,9 @@
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/runConfigurations.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/vcs.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/vcs.xml
new file mode 100644
index 00000000..bc599707
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts b/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts
index 370b9102..0b72c31a 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts
@@ -22,7 +22,7 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
-        versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
+        versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")    
     }
     buildTypes {
         getByName("debug") {
diff --git a/infrastructure/eid-wallet/src/app.css b/infrastructure/eid-wallet/src/app.css
index 93fccdd4..01bbb99b 100644
--- a/infrastructure/eid-wallet/src/app.css
+++ b/infrastructure/eid-wallet/src/app.css
@@ -75,6 +75,7 @@ body {
     padding-bottom: env(safe-area-inset-bottom);
     padding-left: env(safe-area-inset-left);
     padding-right: env(safe-area-inset-right);
+    background-color: var(--color-primary);
 }
 
 /* Ensure background remains correct during transitions */
diff --git a/infrastructure/eid-wallet/src/app.html b/infrastructure/eid-wallet/src/app.html
index 33600a68..4bc55e7d 100644
--- a/infrastructure/eid-wallet/src/app.html
+++ b/infrastructure/eid-wallet/src/app.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%sveltekit.assets%/favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover"/>
     <link rel="preload" href="/fonts/Archivo-VariableFont_wdth,wght.ttf" as="font" type="truetype" crossorigin="anonymous">
     <title>Tauri + SvelteKit + Typescript App</title>
     %sveltekit.head%
diff --git a/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte b/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte
index ad9718e2..bafc2e5d 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/main/+page.svelte
@@ -92,6 +92,7 @@ function shareQR() {
 <Button.Nav href="/scan-qr">
     <Button.Action
         variant="solid"
+        size="sm"
         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"
     >
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 6a0ba3db..c4f6f13f 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
@@ -26,27 +26,27 @@ $effect(() => {
 });
 </script>
 
-<main class="h-[calc(100vh-14vh)] flex flex-col justify-between pt-[3vh]">
+<main class="h-[calc(100svh-14svh)] flex flex-col justify-between pt-[3svh]">
     <section>
         <div>
-            <p class="mb-[1vh]">Enter you current PIN</p>
+            <p class="mb-[1svh]">Enter you current PIN</p>
             <InputPin bind:pin={currentPin} variant="sm"/>
         </div>
         <div>
-            <p class="mb-[1vh]">Enter your new PIN</p>
+            <p class="mb-[1svh]">Enter your new PIN</p>
             <InputPin bind:pin={newPin} {isError} variant="sm"/>
         </div>
         <div>
-            <p class="mb-[1vh]">Confirm new PIN</p>
+            <p class="mb-[1svh]">Confirm new PIN</p>
             <InputPin bind:pin={repeatPin} {isError} variant="sm"/>
         </div>
-        <p class={`text-danger mt-[3.4vh] ${isError ? "block" : "hidden"}`}>Your PIN does not match, try again.</p>
+        <p class={`text-danger mt-[3.4svh] ${isError ? "block" : "hidden"}`}>Your PIN does not match, try again.</p>
     </section>
     <ButtonAction class="w-full" callback={handleChangePIN}>Change PIN</ButtonAction>
 </main>
 
 <Drawer bind:isPaneOpen={showDrawer}>
-        <div class="relative bg-gray w-[72px] h-[72px] rounded-[24px] flex justify-center items-center mb-[2.3vh]">
+        <div class="relative bg-gray w-[72px] h-[72px] rounded-[24px] flex justify-center items-center mb-[2.3svh]">
             <span class="relative z-[1]">
                 <HugeiconsIcon icon={CircleLock01Icon} color="var(--color-primary)"/>
             </span>
@@ -54,6 +54,6 @@ $effect(() => {
             <img class="absolute top-0 start-0" src="/images/Line2.svg" alt="line">
         </div>
         <h4>Pin code changed!</h4>
-        <p class="text-black-700 mt-[0.5vh] mb-[2.3vh]">Your PIN has been changed.</p>
+        <p class="text-black-700 mt-[0.5svh] mb-[2.3svh]">Your PIN has been changed.</p>
         <ButtonAction class="w-full" callback={handleClose}>Close</ButtonAction>
 </Drawer>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte
index 9a8b7324..d8ae1848 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte
@@ -10,7 +10,7 @@ const handleFinish = async () => {
 </script>
 
 
-<main class="h-[max-content] pt-[5.2vh] px-[5vw] pb-[4.5vh] flex flex-col justify-between">
+<main class="h-[max-content] pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between">
     <section>
         <Hero
         title="Your ePassport and eVault are ready"
@@ -25,9 +25,9 @@ const handleFinish = async () => {
 			Passport: "234dfvgsdfg",
 		}}/>
     </section>
-    <section class="mt-[4vh] mb-[9vh]">
+    <section class="mt-[4svh] mb-[9svh]">
         <h4>Your eVault</h4>
-        <p class="text-black-700 mb-[1vh]">We’ve also created your eVault—secure cloud storage for your personal data. W3DS platforms access it directly, keeping you in control.</p>
+        <p class="text-black-700 mb-[1svh]">We’ve also created your eVault—secure cloud storage for your personal data. W3DS platforms access it directly, keeping you in control.</p>
         <IdentityCard variant= "eVault"
 		usedStorage= {15}
 		totalStorage= {80}/>
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte
index 4fd62b79..eae31db9 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/login/+page.svelte
@@ -81,7 +81,7 @@ onMount(async () => {
 });
 </script>
 
-<main class="h-screen pt-[5.2vh] px-[5vw] pb-[4.5vh] flex flex-col justify-between">
+<main class="h-screen pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between">
     <section>
         <Hero
         title="Log in to your account"
@@ -89,7 +89,7 @@ onMount(async () => {
         class="mb-4"
         />
         <InputPin variant="sm" bind:pin isError={isError} onchange={() => handlePinInput(pin)} />
-        <p class={`text-danger mt-[3.4vh] ${isError ? "block" : "hidden"}`}>Your PIN does not match, try again.</p>
+        <p class={`text-danger mt-[3.4svh] ${isError ? "block" : "hidden"}`}>Your PIN does not match, try again.</p>
     </section>
     <Button.Action class={`w-full`} variant="danger" callback={clearPin}>
         Clear Pin
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
index ec88a5f3..3d1b5daf 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
@@ -16,11 +16,11 @@ const handleNext = async () => {
 };
 </script>
 
-<main class="pt-[3vh] px-[5vw] pb-[4.5vh]">
-    <article class="flex justify-center mb-[4vh]">
-        <img class="aspect-square w-full object-cover" src="/images/Onboarding.svg" alt="Infographic card">
+<main class="h-[100dsvh] pt-[3svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between">
+    <article class="flex justify-center">
+        <img class="w-[88vw] h-[39svh]" src="/images/Onboarding.svg" alt="Infographic card">
     </article>
-    <section class="mb-[9.3vh]">
+    <section>
         <Hero
         subtitle="Store your IDs, verify instantly with QR codes, and manage your digital identity with ease."
         class="mb-4"
@@ -33,7 +33,7 @@ const handleNext = async () => {
     </section>
     <section>
         <p class="max-w-[300px] mx-[auto] text-center small text-black-500">By continuing you agree to our <a href="/" class="text-primary underline underline-offset-5">Terms & Conditions </a> and <a href="/" class="text-primary underline underline-offset-5">privacy policy.</a></p>
-        <div class="flex justify-center whitespace-nowrap mt-[2vh]">
+        <div class="flex justify-center whitespace-nowrap mt-[2svh]">
             <ButtonAction class="w-full" callback={handleGetStarted}>Get Started</ButtonAction>
         </div>
     </section>
@@ -41,9 +41,9 @@ const handleNext = async () => {
 
 <Drawer bind:isPaneOpen>
     <img src="/images/GetStarted.svg" alt="get-started">
-    <h4 class="mt-[2.3vh] mb-[0.5vh]">Welcome to Web 3 Data Spaces</h4>
+    <h4 class="mt-[2.3svh] mb-[0.5svh]">Welcome to Web 3 Data Spaces</h4>
     <p class="text-black-700">Your eName is more than a name—it's your unique digital passport. One constant identifier that travels with you across the internet, connecting your real-world self to the digital universe.</p>
-    <div class="flex justify-center whitespace-nowrap my-[2.3vh]">
+    <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
         <ButtonAction class="w-full" callback={handleNext}>Next</ButtonAction>
     </div>
 </Drawer>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte
index b9d788a6..49415099 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/register/+page.svelte
@@ -86,25 +86,25 @@ onMount(async () => {
 </script>
 
 {#if firstStep}
-    <main class="h-screen pt-[5.2vh] px-[5vw] pb-[4.5vh] flex flex-col justify-between">
+    <main class="h-screen pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between">
         <section>
             <Hero
             title="Create a pin"
             subtitle="Enter a 4-digit PIN code"
-            class="mb-[14vh]"
+            class="mb-[14svh]"
             />
             <InputPin bind:pin isError={isError && pin.length === 0}/>
-            <p class={`text-danger mt-[3.4vh] ${isError && pin.length === 0 ? "block" : "hidden"}`}>Your PIN does not match, try again.</p>
+            <p class={`text-danger mt-[3.4svh] ${isError && pin.length === 0 ? "block" : "hidden"}`}>Your PIN does not match, try again.</p>
         </section>
         <ButtonAction class="w-full" variant="soft" callback={handleFirstStep}>Confirm</ButtonAction>
     </main>
 {:else}
-    <main class="h-screen pt-[5.2vh] px-[5vw] pb-[4.5vh] flex flex-col justify-between">
+    <main class="h-screen pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between">
         <section>
             <Hero
             title="Re-enter your pin"
                 subtitle="Confirm by entering pin again"
-            class="mb-[14vh]"
+            class="mb-[14svh]"
             />
             <InputPin bind:pin={repeatPin}/>
         </section>
@@ -115,7 +115,7 @@ onMount(async () => {
 
 <Drawer bind:isPaneOpen={showDrawer}>
     {#if !isBiometricScreen}
-        <div class="relative bg-gray w-[72px] h-[72px] rounded-[24px] flex justify-center items-center mb-[2.3vh]">
+        <div class="relative bg-gray w-[72px] h-[72px] rounded-[24px] flex justify-center items-center mb-[2.3svh]">
             <span class="relative z-[1]">
                 <HugeiconsIcon icon={CircleLock01Icon} color="var(--color-primary)"/>
             </span>
@@ -123,10 +123,10 @@ onMount(async () => {
             <img class="absolute top-0 start-0" src="/images/Line2.svg" alt="line">
         </div>
         <h4>Pin code set!</h4>
-        <p class="text-black-700 mt-[0.5vh] mb-[2.3vh]">Your PIN has been created. You’ll use it to access your digital entity securely.</p>
+        <p class="text-black-700 mt-[0.5svh] mb-[2.3svh]">Your PIN has been created. You’ll use it to access your digital entity securely.</p>
         <ButtonAction class="w-full" callback={handleNext}>Next</ButtonAction>
     {:else}
-        <div class="relative bg-gray w-[72px] h-[72px] rounded-[24px] flex justify-center items-center mb-[2.3vh]">
+        <div class="relative bg-gray w-[72px] h-[72px] rounded-[24px] flex justify-center items-center mb-[2.3svh]">
             <span class="relative z-[1]">
                 <HugeiconsIcon icon={FaceIdIcon} color="var(--color-primary)" />
             </span>
@@ -134,7 +134,7 @@ onMount(async () => {
             <img class="absolute top-0 start-0" src="/images/Line2.svg" alt="line">
         </div>
         <h4>{isBiometricsAdded ? "You’re all set!" : "Add biometrics"}</h4>
-        <p class="text-black-700 mt-[0.5vh] mb-[2.3vh]">{ isBiometricsAdded ? "Your biometrics have been successfully added." : "Use your fingerprint or face recognition for faster, more secure logins."}</p>
+        <p class="text-black-700 mt-[0.5svh] mb-[2.3svh]">{ isBiometricsAdded ? "Your biometrics have been successfully added." : "Use your fingerprint or face recognition for faster, more secure logins."}</p>
         {#if !isBiometricsAdded}
             <div class="flex justify-center items-center gap-[11px]">
                 <ButtonAction class="w-full bg-primary-100 text-primary" callback={handleSkip}>Skip</ButtonAction>
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte
index 93ff78a1..5f821509 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/review/+page.svelte
@@ -8,7 +8,7 @@ const handleNext = async () => {
 };
 </script>
 
-<main class="h-screen pt-[5.2vh] px-[5vw] pb-[4.5vh] flex flex-col justify-between">
+<main class="h-screen pt-[5.2svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between">
     <section>
         <Hero
             title="Here’s your eName"
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
index c7fb2de2..6498f342 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
@@ -25,7 +25,7 @@ onMount(() => {
 });
 </script>
 
-<main class="h-screen pt-[3vh] px-[5vw] pb-[4.5vh] flex flex-col justify-between items-center">
+<main class="h-screen pt-[3svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between items-center">
     <section>
         <Hero
             title="Verify your account"
diff --git a/infrastructure/eid-wallet/src/routes/+layout.svelte b/infrastructure/eid-wallet/src/routes/+layout.svelte
index dc6e7a12..bc6d6bcd 100644
--- a/infrastructure/eid-wallet/src/routes/+layout.svelte
+++ b/infrastructure/eid-wallet/src/routes/+layout.svelte
@@ -91,5 +91,7 @@ onNavigate((navigation) => {
 {#if showSplashScreen}
     <SplashScreen />
 {:else}
-    {@render children?.()}
+    <div class="bg-white h-[100dvh] overflow-scroll">
+        {@render children?.()}
+    </div>
 {/if}