diff --git a/app/src/main/res/layouts/mastodon/layout/preference_switch_material.xml b/app/src/main/res/layouts/mastodon/layout/preference_switch_material.xml
new file mode 100644
index 00000000..400da04a
--- /dev/null
+++ b/app/src/main/res/layouts/mastodon/layout/preference_switch_material.xml
@@ -0,0 +1,5 @@
+<?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="match_parent"
+    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 0afe1d32..c6ea5c2e 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -85,6 +85,7 @@
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
         <item name="android:isLightTheme" tools:targetApi="q">false</item>
         <item name="alertDialogTheme">@style/AppThemeAlertDialog</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
     </style>
 
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 889e6d3e..3b3e558f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -84,6 +84,7 @@
         <item name="android:isLightTheme" tools:targetApi="q">true</item>
         <item name="android:statusBarColor">?android:colorBackground</item>
         <item name="alertDialogTheme">@style/AppThemeAlertDialog</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
     </style>
 
     <style name="Transparent" parent="AppThemeBar">
@@ -277,4 +278,11 @@
         <item name="cornerSize">6dp</item>
     </style>
 
+    <style name="AppPreferenceThemeOverlay" parent="PreferenceThemeOverlay">
+        <item name="switchPreferenceCompatStyle">@style/AppSwitchPreferenceCompatStyle</item>
+    </style>
+
+    <style name="AppSwitchPreferenceCompatStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/preference_switch_material</item>
+    </style>
 </resources>