diff --git a/app/build.gradle b/app/build.gradle
index de25eed70..9657b7c14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,7 +104,7 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.7.0'
+	implementation 'com.google.android.material:material:1.8.0-rc01'
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
 
diff --git a/app/src/main/res/drawable/m3_popup_background.xml b/app/src/main/res/drawable/m3_popup_background.xml
new file mode 100644
index 000000000..3ede5c457
--- /dev/null
+++ b/app/src/main/res/drawable/m3_popup_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<solid android:color="?attr/colorSurface" />
+			<corners android:radius="@dimen/m3_alert_dialog_corner_size" />
+		</shape>
+	</item>
+	<item>
+		<shape>
+			<solid android:color="@color/m3_popupmenu_overlay_color" />
+			<corners android:radius="@dimen/m3_alert_dialog_corner_size" />
+		</shape>
+	</item>
+</layer-list>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1bd4f35b2..43601140e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,10 +24,9 @@
 	<!--AlertDialog-->
 
 	<style name="ThemeOverlay.Kotatsu.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
-		<item name="android:background">?attr/colorSurface</item>
-		<item name="android:textColorPrimary">?attr/colorOnSurface</item>
-		<item name="android:textColor">?attr/colorOnSurface</item>
-		<item name="dialogCornerRadius">28dp</item>
+		<item name="android:layout">@layout/m3_alert_dialog</item>
+		<item name="android:background">@drawable/m3_popup_background</item>
+		<item name="dialogCornerRadius">@dimen/m3_alert_dialog_corner_size</item>
 	</style>
 
 	<!-- Bottom sheet -->