diff --git a/briar-android/src/main/res/layout/fragment_conversation_settings.xml b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
index ccd794e16..db38925f8 100644
--- a/briar-android/src/main/res/layout/fragment_conversation_settings.xml
+++ b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
@@ -40,7 +40,7 @@
 				app:tint="?attr/colorControlNormal"
 				tools:ignore="ContentDescription" />
 
-			<com.google.android.material.switchmaterial.SwitchMaterial
+			<com.google.android.material.materialswitch.MaterialSwitch
 				android:id="@+id/switchDisappearingMessages"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
diff --git a/briar-android/src/main/res/layout/list_item_transport_card.xml b/briar-android/src/main/res/layout/list_item_transport_card.xml
index f29c3ea10..32967c077 100644
--- a/briar-android/src/main/res/layout/list_item_transport_card.xml
+++ b/briar-android/src/main/res/layout/list_item_transport_card.xml
@@ -38,7 +38,7 @@
 
 		</LinearLayout>
 
-		<com.google.android.material.switchmaterial.SwitchMaterial
+		<com.google.android.material.materialswitch.MaterialSwitch
 			android:id="@+id/switchCompat"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/briar-android/src/main/res/layout/preference_switch.xml b/briar-android/src/main/res/layout/preference_switch.xml
new file mode 100644
index 000000000..be9033c43
--- /dev/null
+++ b/briar-android/src/main/res/layout/preference_switch.xml
@@ -0,0 +1,9 @@
+<?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:focusable="false"
+	android:clickable="false"
+	android:background="@null" />
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index 5d993fb22..35c338d13 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
 	<style name="BriarToolbar" parent="Widget.Material3.Toolbar">
 		<item name="android:background">@color/briar_primary</item>
@@ -163,4 +163,10 @@
 		<item name="srcCompat">@drawable/ic_check_white</item>
 	</style>
 
+	<style name="Preference.SwitchPreferenceCompat"
+		parent="@style/Preference.SwitchPreferenceCompat.Material"
+		tools:ignore="ResourceCycle">
+		<item name="widgetLayout">@layout/preference_switch</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index 2de23d82c..60cfd472a 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -20,7 +20,7 @@
 		<item name="windowActionModeOverlay">true</item>
 		<item name="toolbarStyle">@style/BriarToolbar</item>
 		<item name="alertDialogTheme">@style/BriarDialogTheme.Neutral</item>
-		<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+		<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
 	</style>
 
 	<style name="BriarTheme.NoActionBar" parent="BriarTheme">