diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2011490..1cb08c4 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:enableOnBackInvokedCallback="true" 
             android:exported="true"
             android:launchMode="singleTop"
             android:taskAffinity=""
@@ -33,10 +34,10 @@
             android:value="2" />
 
 
-        <service 
-        android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
-        android:foregroundServiceType="dataSync|remoteMessaging"
-        android:exported="false" />
+        <!-- <service 
+            android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
+            android:foregroundServiceType="dataSync|remoteMessaging"
+            android:exported="false" /> -->
 
         <meta-data
             android:name="eu.twonly.service.TWONLY_LOGO"
diff --git a/lib/app.dart b/lib/app.dart
index 29a74b7..dd85911 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -119,10 +119,18 @@ class _AppState extends State<App> with WidgetsBindingObserver {
           ],
           onGenerateTitle: (BuildContext context) => "twonly",
           theme: ThemeData(
-              colorScheme:
-                  ColorScheme.fromSeed(seedColor: const Color(0xFF57CC99)),
-              inputDecorationTheme:
-                  const InputDecorationTheme(border: OutlineInputBorder())),
+            colorScheme: ColorScheme.fromSeed(
+              seedColor: const Color(0xFF57CC99),
+            ),
+            pageTransitionsTheme: const PageTransitionsTheme(
+              builders: {
+                TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
+              },
+            ),
+            inputDecorationTheme: const InputDecorationTheme(
+              border: OutlineInputBorder(),
+            ),
+          ),
           darkTheme: ThemeData.dark().copyWith(
             colorScheme: ColorScheme.fromSeed(
               brightness: Brightness.dark,
diff --git a/lib/src/views/camera/camera_preview_components/permissions_view.dart b/lib/src/views/camera/camera_preview_components/permissions_view.dart
index fc307cd..54fc6e1 100644
--- a/lib/src/views/camera/camera_preview_components/permissions_view.dart
+++ b/lib/src/views/camera/camera_preview_components/permissions_view.dart
@@ -54,37 +54,34 @@ class PermissionHandlerViewState extends State<PermissionHandlerView> {
 
   @override
   Widget build(BuildContext context) {
-    return PopScope(
-      onPopInvokedWithResult: (bool didPop, Object? result) async {},
-      child: Scaffold(
-        body: Center(
-          child: Container(
-            padding: EdgeInsets.all(100),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                Text(
-                  "twonly needs access to the camera and microphone.",
-                  textAlign: TextAlign.center,
-                ),
-                SizedBox(height: 50),
-                FilledButton.icon(
-                  label: Text("Request permissions"),
-                  icon: const Icon(Icons.perm_camera_mic),
-                  onPressed: () async {
-                    try {
-                      await permissionServices();
-                      if (await checkPermissions()) {
-                        widget.onSuccess();
-                      }
-                    } catch (e) {
-                      Log.error(e);
+    return Scaffold(
+      body: Center(
+        child: Container(
+          padding: EdgeInsets.all(100),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text(
+                "twonly needs access to the camera and microphone.",
+                textAlign: TextAlign.center,
+              ),
+              SizedBox(height: 50),
+              FilledButton.icon(
+                label: Text("Request permissions"),
+                icon: const Icon(Icons.perm_camera_mic),
+                onPressed: () async {
+                  try {
+                    await permissionServices();
+                    if (await checkPermissions()) {
+                      widget.onSuccess();
                     }
-                  },
-                ),
-              ],
-            ),
+                  } catch (e) {
+                    Log.error(e);
+                  }
+                },
+              ),
+            ],
           ),
         ),
       ),