diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
index a66e7bad2f..9d1b345c50 100644
--- a/app/src/main/res/values-night/bools.xml
+++ b/app/src/main/res/values-night/bools.xml
@@ -2,4 +2,5 @@
 <resources>
     <bool name="lightStatusBar">false</bool>
     <bool name="lightNavigationBar">false</bool>
+    <bool name="elevationOverlayEnabled">true</bool>
 </resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index ab52ba9e3f..2aa4297cff 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -2,4 +2,5 @@
 <resources>
     <bool name="lightStatusBar">true</bool>
     <bool name="lightNavigationBar">false</bool>
+    <bool name="elevationOverlayEnabled">false</bool>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5814a6f7c6..84274ec8b2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -261,6 +261,17 @@
         <item name="tabRippleColor">?attr/colorOnPrimary</item>
     </style>
 
+    <!--==============-->
+    <!--Widgets.Switch-->
+    <!--==============-->
+    <style name="Widget.Tachiyomi.Switch" parent="Widget.MaterialComponents.CompoundButton.Switch">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Tachiyomi.Switch</item>
+    </style>
+
+    <style name="ThemeOverlay.Tachiyomi.Switch" parent="">
+        <item name="elevationOverlayEnabled">@bool/elevationOverlayEnabled</item>
+    </style>
+
 
     <!--================-->
     <!--Navigation Views-->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c95271d495..27e408124c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -64,6 +64,7 @@
         <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
         <item name="bottomNavigationStyle">@style/Widget.Tachiyomi.BottomNavigationView</item>
         <item name="navigationRailStyle">@style/Widget.Tachiyomi.NavigationRailView</item>
+        <item name="switchStyle">@style/Widget.Tachiyomi.Switch</item>
         <item name="elevationOverlayEnabled">false</item>
         <item name="lightSystemBarsOnPrimary">false</item>