diff --git a/webclient/android/app/src/main/java/com/gnexus/shserv/MainActivity.java b/webclient/android/app/src/main/java/com/gnexus/shserv/MainActivity.java
index 48e181d..e1eecce 100644
--- a/webclient/android/app/src/main/java/com/gnexus/shserv/MainActivity.java
+++ b/webclient/android/app/src/main/java/com/gnexus/shserv/MainActivity.java
@@ -1,8 +1,10 @@
 package com.gnexus.shserv;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Window;
 import android.view.WindowManager;
+import androidx.core.view.WindowCompat;
 import com.getcapacitor.BridgeActivity;
 
 public class MainActivity extends BridgeActivity {
@@ -14,12 +16,13 @@
         setTheme(R.style.AppTheme_NoActionBar);
         super.onCreate(savedInstanceState);
 
-        // Ensure status bar does not overlay content
+        // Prevent edge-to-edge: content must NOT draw behind status bar
         Window window = getWindow();
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,
-            WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
-        );
-        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        WindowCompat.setDecorFitsSystemWindows(window, true);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
     }
 }
diff --git a/webclient/android/app/src/main/res/values/styles.xml b/webclient/android/app/src/main/res/values/styles.xml
index 50fa6f8..382778e 100644
--- a/webclient/android/app/src/main/res/values/styles.xml
+++ b/webclient/android/app/src/main/res/values/styles.xml
@@ -10,6 +10,7 @@
         <item name="android:navigationBarColor">@color/bg_dark</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="Theme.MaterialComponents.DayNight.NoActionBar">
@@ -20,6 +21,7 @@
         <item name="android:navigationBarColor">@color/bg_dark</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
diff --git a/webclient/capacitor.config.json b/webclient/capacitor.config.json
index 2b0ef08..8625deb 100644
--- a/webclient/capacitor.config.json
+++ b/webclient/capacitor.config.json
@@ -5,7 +5,8 @@
   "bundledWebRuntime": false,
   "android": {
     "backgroundColor": "#0f172a",
-    "allowMixedContent": true
+    "allowMixedContent": true,
+    "adjustMarginsForEdgeToEdge": "force"
   },
   "server": {
     "androidScheme": "https"