diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 9ca4e21b2..d0dfdd262 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,14 +1,14 @@
 <resources>
 
     <!-- Base light application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.EdgeToEdge.Light">
         <!-- Customize your theme here. -->
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:editTextStyle">@style/MendixEditText</item>
     </style>
     <!-- Base dark application theme. -->
-    <style name="AppTheme_Dark" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppTheme_Dark" parent="Theme.EdgeToEdge">
         <!-- Customize your theme here. -->
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/android/gradle.properties b/android/gradle.properties
index ace0bb1d6..d1133f4d2 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,3 +26,6 @@ android.suppressUnsupportedCompileSdk=33
 newArchEnabled=false
 hermesEnabled=true
 mendixnative.cookieEncryption=false
+
+# Enable edge-to-edge display (React Native 0.81+)
+edgeToEdgeEnabled=true
diff --git a/ios/PrivacyInfo.xcprivacy b/ios/PrivacyInfo.xcprivacy
index 69ee8655b..ca9aeab07 100644
--- a/ios/PrivacyInfo.xcprivacy
+++ b/ios/PrivacyInfo.xcprivacy
@@ -41,6 +41,14 @@
 				<string>E174.1</string>
 			</array>
 		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryLocationServices</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>DDA9.1</string>
+			</array>
+		</dict>
 	</array>
 	<key>NSPrivacyCollectedDataTypes</key>
 	<array/>
diff --git a/ios/nativeTemplate/Info.plist b/ios/nativeTemplate/Info.plist
index eb2ba7158..30a94425f 100644
--- a/ios/nativeTemplate/Info.plist
+++ b/ios/nativeTemplate/Info.plist
@@ -50,11 +50,11 @@
 	<key>NSFaceIDUsageDescription</key>
 	<string>Enabling Face ID allows you quick and secure access to your account.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>To use that feature the app needs access to your location.</string>
+	<string>This app requires access to your location to provide location-based features and services.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>To use that feature the app needs access to your location.</string>
+	<string>This app requires access to your location while using the app to provide location-based features and services.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>To use that feature the app needs access to your location.</string>
+	<string>This app requires access to your location to provide location-based features and services even when the app is in the background.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>To use that feature the app needs access to your microphone.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
diff --git a/package-lock.json b/package-lock.json
index c77f70449..082469bef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
         "react-native": "0.77.3",
         "react-native-blob-util": "0.21.2",
         "react-native-device-info": "13.0.0",
+        "react-native-edge-to-edge": "^1.7.0",
         "react-native-fast-image": "8.6.3",
         "react-native-gesture-handler": "2.23.1",
         "react-native-image-picker": "7.2.3",
@@ -7691,6 +7692,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",
diff --git a/package.json b/package.json
index 6357ac2ec..7af3b0e05 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "react-native": "0.77.3",
     "react-native-blob-util": "0.21.2",
     "react-native-device-info": "13.0.0",
+    "react-native-edge-to-edge": "^1.7.0",
     "react-native-fast-image": "8.6.3",
     "react-native-gesture-handler": "2.23.1",
     "react-native-image-picker": "7.2.3",