diff --git a/src/main/res/layout/view_preference_switch.xml b/src/main/res/layout/view_preference_switch.xml
new file mode 100644
index 000000000..ba3fd967a
--- /dev/null
+++ b/src/main/res/layout/view_preference_switch.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="wrap_content"
+    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/src/main/res/values-night/themes_custom.xml b/src/main/res/values-night/themes_custom.xml
index c98a09954..c06eacb13 100644
--- a/src/main/res/values-night/themes_custom.xml
+++ b/src/main/res/values-night/themes_custom.xml
@@ -1,13 +1,19 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ThemeCustom" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Material3 tech documentation; https://github.com/material-components/material-components-android/blob/master/docs/components/ -->
+
         <item name="colorPrimary">@color/opentracks</item>
         <item name="colorSecondary">@color/opentracks</item>
 
+        <!-- Material3 https://github.com/material-components/material-components-android/issues/2828#issuecomment-1187563903 -->
+        <item name="switchPreferenceCompatStyle">@style/MaterialSwitchPreferenceCompat</item>
+
         <item name="android:statusBarColor">@color/oled_friendly</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">@color/oled_friendly</item>
 
+
         <item name="bottomAppBarStyle">@style/Widget.OpenTracks.BottomAppBar</item>
         <item name="floatingActionButtonStyle">@style/Widget.OpenTracks.FloatingActionButton</item>
 
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index b7e239d21..04e97ab6c 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -19,6 +19,9 @@ limitations under the License.
         <item name="colorPrimary">@color/opentracks</item>
         <item name="colorSecondary">@color/opentracks</item>
 
+        <!-- Material3 https://github.com/material-components/material-components-android/issues/2828#issuecomment-1187563903 -->
+        <item name="switchPreferenceCompatStyle">@style/MaterialSwitchPreferenceCompat</item>
+
         <item name="android:statusBarColor">?attr/colorSurfaceBright</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:navigationBarColor">?attr/colorSurfaceContainer</item>
@@ -49,4 +52,7 @@ limitations under the License.
         <item name="fabCustomSize">64dp</item>
     </style>
 
+    <style name="MaterialSwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/view_preference_switch</item>
+    </style>
 </resources>