diff --git a/core/src/main/res/layout/preference_material3_switch.xml b/core/src/main/res/layout/preference_material3_switch.xml
new file mode 100644
index 00000000..5a7ae7e5
--- /dev/null
+++ b/core/src/main/res/layout/preference_material3_switch.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />
diff --git a/core/src/main/res/values/themes.xml b/core/src/main/res/values/themes.xml
index d53f8b5f..b4d9a045 100644
--- a/core/src/main/res/values/themes.xml
+++ b/core/src/main/res/values/themes.xml
@@ -40,6 +40,8 @@
 
         <!-- Extra -->
         <item name="elevationOverlayEnabled">false</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
+        <item name="dialogCornerRadius">28dp</item>
     </style>
 
     <string-array name="themes">
diff --git a/core/src/main/res/xml/fragment_settings_appearance.xml b/core/src/main/res/xml/fragment_settings_appearance.xml
index 6349396b..8b3a731a 100644
--- a/core/src/main/res/xml/fragment_settings_appearance.xml
+++ b/core/src/main/res/xml/fragment_settings_appearance.xml
@@ -7,9 +7,10 @@
         app:key="theme"
         app:title="@string/theme"
         app:useSimpleSummaryProvider="true" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="true"
         app:key="dynamic_colors"
         app:summary="@string/dynamic_colors_summary"
-        app:title="@string/dynamic_colors" />
+        app:title="@string/dynamic_colors"
+        app:widgetLayout="@layout/preference_material3_switch" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/core/src/main/res/xml/fragment_settings_cache.xml b/core/src/main/res/xml/fragment_settings_cache.xml
index d54321fc..bc7e5ff0 100644
--- a/core/src/main/res/xml/fragment_settings_cache.xml
+++ b/core/src/main/res/xml/fragment_settings_cache.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="true"
         app:key="pref_image_cache"
         app:summary="@string/settings_use_cache_summary"
-        app:title="@string/settings_use_cache_title" />
+        app:title="@string/settings_use_cache_title"
+        app:widgetLayout="@layout/preference_material3_switch" />
     <EditTextPreference
         app:defaultValue="20"
         app:dependency="pref_image_cache"
diff --git a/core/src/main/res/xml/fragment_settings_downloads.xml b/core/src/main/res/xml/fragment_settings_downloads.xml
index e245447d..a45f00a1 100644
--- a/core/src/main/res/xml/fragment_settings_downloads.xml
+++ b/core/src/main/res/xml/fragment_settings_downloads.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreference
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
         app:key="download_mobile_data"
         app:title="@string/download_mobile_data"
-        android:defaultValue="false" />
-    <SwitchPreference
+        app:widgetLayout="@layout/preference_material3_switch" />
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
         app:key="download_roaming"
         app:title="@string/download_roaming"
-        android:defaultValue="false" />
+        app:widgetLayout="@layout/preference_material3_switch" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/core/src/main/res/xml/fragment_settings_player.xml b/core/src/main/res/xml/fragment_settings_player.xml
index 88a47c12..a3f2b4d2 100644
--- a/core/src/main/res/xml/fragment_settings_player.xml
+++ b/core/src/main/res/xml/fragment_settings_player.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         app:key="pref_player_display_extended_title"
         app:summary="@string/display_extended_title_summary"
-        app:title="@string/display_extended_title" />
+        app:title="@string/display_extended_title"
+        app:widgetLayout="@layout/preference_material3_switch" />
 
     <Preference
         app:key="pref_player_subtitles"
@@ -11,11 +12,12 @@
         app:title="@string/subtitles" />
 
     <PreferenceCategory app:title="@string/mpv_player">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:key="pref_player_mpv"
             app:summary="@string/mpv_player_summary"
-            app:title="@string/mpv_player" />
-        <DropDownPreference
+            app:title="@string/mpv_player"
+            app:widgetLayout="@layout/preference_material3_switch" />
+        <ListPreference
             app:defaultValue="mediacodec-copy"
             app:dependency="pref_player_mpv"
             app:entries="@array/mpv_hwdec"
@@ -30,7 +32,7 @@
             app:entryValues="@array/mpv_hwdec_codecs"
             app:key="pref_player_mpv_hwdec_codecs"
             app:title="@string/pref_player_mpv_hwdec_codecs" />
-        <DropDownPreference
+        <ListPreference
             app:defaultValue="gpu"
             app:dependency="pref_player_mpv"
             app:entries="@array/mpv_vos"
@@ -38,7 +40,7 @@
             app:key="pref_player_mpv_vo"
             app:title="@string/pref_player_mpv_vo"
             app:useSimpleSummaryProvider="true" />
-        <DropDownPreference
+        <ListPreference
             app:defaultValue="audiotrack"
             app:dependency="pref_player_mpv"
             app:entries="@array/mpv_aos"
@@ -46,7 +48,7 @@
             app:key="pref_player_mpv_ao"
             app:title="@string/pref_player_mpv_ao"
             app:useSimpleSummaryProvider="true" />
-        <DropDownPreference
+        <ListPreference
             app:defaultValue="opengl"
             app:dependency="pref_player_mpv"
             app:entries="@array/mpv_gpu_api"
@@ -57,26 +59,30 @@
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/gestures">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:key="pref_player_gestures"
-            app:title="@string/player_gestures" />
-        <SwitchPreference
+            app:title="@string/player_gestures"
+            app:widgetLayout="@layout/preference_material3_switch" />
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:dependency="pref_player_gestures"
             app:key="pref_player_gestures_vb"
             app:summary="@string/player_gestures_vb_summary"
-            app:title="@string/player_gestures_vb" />
-        <SwitchPreference
+            app:title="@string/player_gestures_vb"
+            app:widgetLayout="@layout/preference_material3_switch" />
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:dependency="pref_player_gestures"
             app:key="pref_player_gestures_zoom"
             app:summary="@string/player_gestures_zoom_summary"
-            app:title="@string/player_gestures_zoom" />
-        <SwitchPreference
+            app:title="@string/player_gestures_zoom"
+            app:widgetLayout="@layout/preference_material3_switch" />
+        <SwitchPreferenceCompat
             app:dependency="pref_player_gestures_vb"
             app:key="pref_player_brightness_remember"
-            app:title="@string/player_brightness_remember" />
+            app:title="@string/player_brightness_remember"
+            app:widgetLayout="@layout/preference_material3_switch" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/seeking">
@@ -92,10 +98,11 @@
             app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         app:defaultValue="true"
         app:key="pref_player_intro_skipper"
+        app:summary="@string/pref_player_intro_skipper_summary"
         app:title="@string/pref_player_intro_skipper"
-        app:summary="@string/pref_player_intro_skipper_summary"/>
+        app:widgetLayout="@layout/preference_material3_switch" />
 
 </PreferenceScreen>
\ No newline at end of file