diff --git a/app/ui/src/main/AndroidManifest.xml b/app/ui/src/main/AndroidManifest.xml
index 611c1edf..8964123f 100644
--- a/app/ui/src/main/AndroidManifest.xml
+++ b/app/ui/src/main/AndroidManifest.xml
@@ -55,7 +55,9 @@
             android:launchMode="singleTask"
             android:parentActivityName=".launcher.SharedLauncherActivity"
             android:taskAffinity="de.mm20.launcher2.settings"
-            android:theme="@style/SettingsTheme.NoActionBar">
+            android:theme="@style/SettingsTheme.NoActionBar"
+            android:enableOnBackInvokedCallback="true"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
index f2fcc412..65b6f692 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
@@ -398,7 +398,7 @@ fun PagerScaffold(
                     modifier = Modifier
                         .fillMaxSize()
                         .nestedScroll(pagerNestedScrollConnection),
-                    outOfBoundsPageCount = 1,
+                    beyondViewportPageCount = 1,
                     reverseLayout = reverse == (LocalLayoutDirection.current == LayoutDirection.Ltr),
                     state = pagerState,
                     userScrollEnabled = false,//!isWidgetEditMode,
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
index a40a237d..ff5381ea 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
@@ -401,7 +401,7 @@ fun PullDownScaffold(
             ) {
                 VerticalPager(
                     modifier = Modifier.fillMaxSize(),
-                    outOfBoundsPageCount = 1,
+                    beyondViewportPageCount = 1,
                     state = pagerState,
                     reverseLayout = true,
                     userScrollEnabled = false,
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
index 6d75653c..40bd8be1 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
@@ -102,16 +102,16 @@ class SettingsActivity : BaseActivity() {
                                 navController = navController,
                                 startDestination = "settings",
                                 exitTransition = {
-                                    fadeOut() + scaleOut(targetScale = 0.5f)
+                                    slideOutHorizontally { it / 2 } + fadeOut()
                                 },
                                 enterTransition = {
-                                    slideInHorizontally { it }
+                                    slideInHorizontally { it / 2 } + scaleIn(initialScale = 0.95f)
                                 },
                                 popEnterTransition = {
-                                    fadeIn() + scaleIn(initialScale = 0.5f)
+                                    slideInHorizontally { -it / 2 } + fadeIn()
                                 },
                                 popExitTransition = {
-                                    slideOutHorizontally { it }
+                                    slideOutHorizontally { it / 2 } + scaleOut(targetScale = 0.95f)
                                 },
                             ) {
                                 composable("settings") {
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt
index 11d0dfb8..e7e50772 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt
@@ -51,6 +51,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
@@ -572,7 +573,7 @@ fun CustomizeAppSearch(viewModel: EditSearchActionSheetVM, paddingValues: Paddin
             Box(modifier = Modifier
                 .fillMaxWidth()
                 .clickable { showAppDropdown = !showAppDropdown }) {
-                TextFieldDefaults.OutlinedTextFieldDecorationBox(
+                OutlinedTextFieldDefaults.DecorationBox(
                     value = selectedApp?.label ?: "",
                     enabled = true,
                     label = { Text(stringResource(R.string.search_action_app)) },
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 142f3dc3..caa80f11 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,8 +17,8 @@ kotlinx-serialization = "1.6.3"
 
 jetbrains-markdown = "0.5.2"
 
-androidx-compose = "1.7.0-alpha05"
-androidx-compose-material3 = "1.3.0-alpha03"
+androidx-compose = "1.7.0-alpha06"
+androidx-compose-material3 = "1.3.0-alpha04"
 androidx-compose-compiler = "1.5.11"
 androidx-lifecycle = "2.7.0"
 androidx-core = "1.12.0"
@@ -95,7 +95,7 @@ androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterfa
 androidx-securitycrypto = { group = "androidx.security", name = "security-crypto", version = "1.1.0-alpha03" }
 androidx-datastore = { group = "androidx.datastore", name = "datastore", version = "1.0.0" }
 
-androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version = "2.7.7" }
+androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version = "2.8.0-alpha06" }
 materialcomponents-core = { group = "com.google.android.material", name = "material", version = "1.11.0" }
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.12.0" }