diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java
index 7b612809d..f669636f6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java
@@ -16,7 +16,7 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import static org.briarproject.briar.android.AppModule.getAndroidComponent;
 import static org.briarproject.briar.android.settings.SettingsActivity.enableAndPersist;
@@ -40,12 +40,12 @@ public class ConnectionsFragment extends PreferenceFragmentCompat {
 	private SettingsViewModel viewModel;
 	private ConnectionsManager connectionsManager;
 
-	private SwitchPreference enableBluetooth;
-	private SwitchPreference enableWifi;
-	private SwitchPreference enableTor;
+	private SwitchPreferenceCompat enableBluetooth;
+	private SwitchPreferenceCompat enableWifi;
+	private SwitchPreferenceCompat enableTor;
 	private ListPreference torNetwork;
-	private SwitchPreference torMobile;
-	private SwitchPreference torOnlyWhenCharging;
+	private SwitchPreferenceCompat torMobile;
+	private SwitchPreferenceCompat torOnlyWhenCharging;
 
 	@Override
 	public void onAttach(@NonNull Context context) {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java
index 241e5812d..89ba2482e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java
@@ -16,7 +16,7 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import static android.os.Build.VERSION.SDK_INT;
 import static java.util.Objects.requireNonNull;
@@ -36,7 +36,7 @@ public class SecurityFragment extends PreferenceFragmentCompat {
 	ViewModelProvider.Factory viewModelFactory;
 
 	private SettingsViewModel viewModel;
-	private SwitchPreference screenLock;
+	private SwitchPreferenceCompat screenLock;
 	private ListPreference screenLockTimeout;
 
 	@Override
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 638ef70a8..2ad07a951 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
@@ -44,7 +44,6 @@
 			android:layout_height="wrap_content"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_medium"
-			android:widgetLayout="@layout/preference_switch_compat"
 			tools:checked="true"
 			tools:text="@string/tor_enable_title" />
 
diff --git a/briar-android/src/main/res/layout/preference_switch_compat.xml b/briar-android/src/main/res/layout/preference_switch_compat.xml
deleted file mode 100644
index 7ebf4bbbe..000000000
--- a/briar-android/src/main/res/layout/preference_switch_compat.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Needed for SwitchPreference on Android 4 (API < 21)-->
-<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@android:id/switch_widget"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:background="@null"
-	android:clickable="false"
-	android:focusable="false"
-	android:focusableInTouchMode="false"
-	tools:targetApi="n" />
diff --git a/briar-android/src/main/res/xml/settings_connections.xml b/briar-android/src/main/res/xml/settings_connections.xml
index 0fcbda021..0ef427868 100644
--- a/briar-android/src/main/res/xml/settings_connections.xml
+++ b/briar-android/src/main/res/xml/settings_connections.xml
@@ -2,32 +2,29 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:enabled="false"
 		android:key="pref_key_bluetooth"
 		android:persistent="false"
 		android:title="@string/bluetooth_setting"
-		android:widgetLayout="@layout/preference_switch_compat"
 		app:iconSpaceReserved="false" />
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:enabled="false"
 		android:key="pref_key_wifi"
 		android:persistent="false"
 		android:title="@string/wifi_setting"
-		android:widgetLayout="@layout/preference_switch_compat"
 		app:iconSpaceReserved="false" />
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="true"
 		android:enabled="false"
 		android:key="pref_key_tor_enable"
 		android:persistent="false"
 		android:summary="@string/tor_enable_summary"
 		android:title="@string/tor_enable_title"
-		android:widgetLayout="@layout/preference_switch_compat"
 		app:iconSpaceReserved="false" />
 
 	<ListPreference
@@ -42,17 +39,16 @@
 		android:title="@string/tor_network_setting"
 		app:iconSpaceReserved="false" />
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="true"
 		android:dependency="pref_key_tor_enable"
 		android:enabled="false"
 		android:key="pref_key_tor_mobile_data"
 		android:persistent="false"
 		android:title="@string/tor_mobile_data_title"
-		android:widgetLayout="@layout/preference_switch_compat"
 		app:iconSpaceReserved="false" />
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:dependency="pref_key_tor_enable"
 		android:enabled="false"
@@ -60,7 +56,6 @@
 		android:persistent="false"
 		android:summary="@string/tor_only_when_charging_summary"
 		android:title="@string/tor_only_when_charging_title"
-		android:widgetLayout="@layout/preference_switch_compat"
 		app:iconSpaceReserved="false" />
 
 </PreferenceScreen>
diff --git a/briar-android/src/main/res/xml/settings_security.xml b/briar-android/src/main/res/xml/settings_security.xml
index aea43dc5a..568efc714 100644
--- a/briar-android/src/main/res/xml/settings_security.xml
+++ b/briar-android/src/main/res/xml/settings_security.xml
@@ -3,13 +3,12 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools">
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:enabled="false"
 		android:key="pref_key_lock"
 		android:persistent="false"
 		android:summary="@string/pref_lock_summary"
 		android:title="@string/pref_lock_title"
-		android:widgetLayout="@layout/preference_switch_compat"
 		app:iconSpaceReserved="false" />
 
 	<ListPreference