diff --git a/android/app/src/production/res/values/styles.xml b/android/app/src/production/res/values/styles.xml
index a3e7a47..fa1169f 100644
--- a/android/app/src/production/res/values/styles.xml
+++ b/android/app/src/production/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.MakeItNative" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="Theme.MakeItNative" parent="Theme.EdgeToEdge.Material2.Light">
 
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/blue1</item>
@@ -20,6 +20,9 @@
         <item name="android:colorBackground">#161F30</item>
         <item name="android:navigationBarColor">#0A1325</item>
         <item name="android:actionBarSize">90dp</item>
+        
+        <!-- Edge-to-edge: disable the contrasting background of the navigation bar -->
+        <item name="enforceNavigationBarContrast">false</item>
     </style>
 
     <style name="Theme.MakeItNative.TextInputEditText" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
diff --git a/android/gradle.properties b/android/gradle.properties
index 6c8684e..343f487 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,4 +26,6 @@ android.nonTransitiveRClass=true
 # enabled by default in RN 0.76 so we need to disable it explicitly
 newArchEnabled=false
 hermesEnabled=true
-mendixnative.cookieEncryption=true
\ No newline at end of file
+mendixnative.cookieEncryption=true
+
+edgeToEdgeEnabled=true
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 3894766..0e1bfbc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,6 +36,7 @@
         "react-native-calendar-events": "2.1.0",
         "react-native-camera": "3.40.0",
         "react-native-device-info": "13.0.0",
+        "react-native-edge-to-edge": "^1.7.0",
         "react-native-fast-image": "8.6.3",
         "react-native-file-viewer": "2.1.5",
         "react-native-geocoder": "0.5.0",
@@ -7823,6 +7824,16 @@
         "react-native": "*"
       }
     },
+    "node_modules/react-native-edge-to-edge": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/react-native-edge-to-edge/-/react-native-edge-to-edge-1.7.0.tgz",
+      "integrity": "sha512-ERegbsq28yoMndn/Uq49i4h6aAhMvTEjOfkFh50yX9H/dMjjCr/Tix/es/9JcPRvC+q7VzCMWfxWDUb6Jrq1OQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/react-native-fast-image": {
       "version": "8.6.3",
       "resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-8.6.3.tgz",
@@ -15076,6 +15087,11 @@
       "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-13.0.0.tgz",
       "integrity": "sha512-TKCq4XKl8lzB04RdEbADxkbzDJwOfWcxZxNcf1LweT+A+KRAUv1no7bch7RM0WLyMVKMTa2hbusESnzxB5QQRA=="
     },
+    "react-native-edge-to-edge": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/react-native-edge-to-edge/-/react-native-edge-to-edge-1.7.0.tgz",
+      "integrity": "sha512-ERegbsq28yoMndn/Uq49i4h6aAhMvTEjOfkFh50yX9H/dMjjCr/Tix/es/9JcPRvC+q7VzCMWfxWDUb6Jrq1OQ=="
+    },
     "react-native-fast-image": {
       "version": "8.6.3",
       "resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-8.6.3.tgz",
diff --git a/package.json b/package.json
index bbdec57..ab2948f 100644
--- a/package.json
+++ b/package.json
@@ -18,14 +18,16 @@
     "snyk:android": "cd android && snyk monitor --gradle-sub-project=app --configuration-attributes='com.android.build.api.attributes.BuildTypeAttr:release,react-native-camera:general,org.jetbrains.kotlin.platform.type:androidJvm' --configuration-matching='compile|implementation' --org=appdev --project-name=developerapp-android${SNYK_SUBPROJECT}"
   },
   "dependencies": {
+    "@gorhom/bottom-sheet": "^5.1.1",
     "@mendix/native": "9.1.0",
     "@op-engineering/op-sqlite": "9.2.7",
-    "@gorhom/bottom-sheet": "^5.1.1",
     "@react-native-async-storage/async-storage": "2.0.0",
-    "@react-native-community/datetimepicker": "8.2.0",
     "@react-native-camera-roll/camera-roll": "7.4.0",
+    "@react-native-community/cli": "16.0.2",
+    "@react-native-community/cli-platform-android": "16.0.2",
+    "@react-native-community/cli-platform-ios": "16.0.2",
+    "@react-native-community/datetimepicker": "8.2.0",
     "@react-native-community/geolocation": "3.4.0",
-    "@react-native-masked-view/masked-view": "0.3.1",
     "@react-native-community/netinfo": "11.4.1",
     "@react-native-community/push-notification-ios": "1.10.1",
     "@react-native-firebase/analytics": "17.3.0",
@@ -33,20 +35,19 @@
     "@react-native-firebase/crashlytics": "17.3.0",
     "@react-native-firebase/messaging": "17.3.0",
     "@react-native-firebase/ml": "17.3.0",
+    "@react-native-masked-view/masked-view": "0.3.1",
     "@react-native-picker/picker": "2.11.0",
+    "@swan-io/react-native-browser": "0.4.1",
     "react-native": "0.77.3",
-    "@react-native-community/cli": "16.0.2",
-    "@react-native-community/cli-platform-ios": "16.0.2",
-    "@react-native-community/cli-platform-android": "16.0.2",
     "react-native-ble-plx": "2.0.3",
     "react-native-blob-util": "0.21.2",
     "react-native-calendar-events": "2.1.0",
     "react-native-camera": "3.40.0",
     "react-native-device-info": "13.0.0",
+    "react-native-edge-to-edge": "1.7.0",
     "react-native-fast-image": "8.6.3",
     "react-native-file-viewer": "2.1.5",
     "react-native-geocoder": "0.5.0",
-    "@swan-io/react-native-browser": "0.4.1",
     "react-native-gesture-handler": "2.23.1",
     "react-native-image-picker": "7.2.3",
     "react-native-inappbrowser-reborn": "3.6.3",