diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 9703fd3a..4f0a5616 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -72,7 +72,6 @@ dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
     kapt("androidx.room:room-compiler:$roomVersion")
     implementation(kotlin("stdlib-jdk8"))
-    implementation("androidx.appcompat:appcompat:1.4.1")    // https://issuetracker.google.com/issues/151603528
     implementation("androidx.browser:browser:1.4.0")
     implementation("androidx.core:core-ktx:1.8.0-rc02")
     implementation("androidx.fragment:fragment-ktx:1.5.0-rc01")
@@ -83,7 +82,7 @@ dependencies {
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("com.android.billingclient:billing-ktx:5.0.0")
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
-    implementation("com.google.android.material:material:1.6.1")
+    implementation("com.google.android.material:material:1.7.0-alpha02")
     implementation("com.google.firebase:firebase-analytics-ktx:21.0.0")
     implementation("com.google.firebase:firebase-crashlytics:18.2.11")
     implementation("com.google.zxing:core:3.5.0")
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
index fbe9e4a5..c3ae75d1 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
@@ -7,7 +7,7 @@ import androidx.core.content.FileProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreference
+import androidx.preference.TwoStatePreference
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.net.TetherOffloadManager
 import be.mygod.vpnhotspot.net.monitor.FallbackUpstreamMonitor
@@ -46,7 +46,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
         addPreferencesFromResource(R.xml.pref_settings)
         SummaryFallbackProvider(findPreference(UpstreamMonitor.KEY)!!)
         SummaryFallbackProvider(findPreference(FallbackUpstreamMonitor.KEY)!!)
-        findPreference<SwitchPreference>("system.enableTetherOffload")!!.apply {
+        findPreference<TwoStatePreference>("system.enableTetherOffload")!!.apply {
             if (TetherOffloadManager.supported) {
                 isChecked = TetherOffloadManager.enabled
                 setOnPreferenceChangeListener { _, newValue ->
@@ -66,7 +66,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
                 }
             } else parent!!.removePreference(this)
         }
-        findPreference<SwitchPreference>(BootReceiver.KEY)!!.setOnPreferenceChangeListener { _, value ->
+        findPreference<TwoStatePreference>(BootReceiver.KEY)!!.setOnPreferenceChangeListener { _, value ->
             BootReceiver.onUserSettingUpdated(value as Boolean)
             true
         }
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index dd5f96d0..515460f1 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -97,7 +97,7 @@
                     android:maxLength="63"
                     android:imeOptions="flagForceAscii" />
             </com.google.android.material.textfield.TextInputLayout>
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/auto_shutdown"
                 style="@style/wifi_item_label"
                 android:layout_width="match_parent"
@@ -192,7 +192,7 @@
                         android:inputType="number"
                         android:maxLength="10" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <Switch
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/client_user_control"
                     style="@style/wifi_item_label"
                     android:layout_width="match_parent"
@@ -261,7 +261,7 @@
                         android:inputType="textNoSuggestions"
                         android:maxLength="17" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <Switch
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/mac_randomization"
                     style="@style/wifi_item_label"
                     android:layout_width="match_parent"
@@ -269,7 +269,7 @@
                     android:layout_marginTop="8dip"
                     android:minHeight="@dimen/touch_target_min"
                     android:text="@string/wifi_mac_randomization" />
-                <Switch
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/hidden_ssid"
                     style="@style/wifi_item_label"
                     android:layout_width="match_parent"
@@ -277,7 +277,7 @@
                     android:layout_marginTop="8dip"
                     android:minHeight="@dimen/touch_target_min"
                     android:text="@string/wifi_hidden_network" />
-                <Switch
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/ieee_80211ax"
                     style="@style/wifi_item_label"
                     android:layout_width="match_parent"
@@ -285,7 +285,7 @@
                     android:layout_marginTop="8dip"
                     android:minHeight="@dimen/touch_target_min"
                     android:text="@string/wifi_ieee_80211ax" />
-                <Switch
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/bridged_mode_opportunistic_shutdown"
                     style="@style/wifi_item_label"
                     android:layout_width="match_parent"
@@ -293,7 +293,7 @@
                     android:layout_marginTop="8dip"
                     android:minHeight="@dimen/touch_target_min"
                     android:text="@string/wifi_bridged_mode_opportunistic_shutdown" />
-                <Switch
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/user_config"
                     style="@style/wifi_item_label"
                     android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/listitem_interface.xml b/mobile/src/main/res/layout/listitem_interface.xml
index a7d433b0..6570d4ee 100644
--- a/mobile/src/main/res/layout/listitem_interface.xml
+++ b/mobile/src/main/res/layout/listitem_interface.xml
@@ -50,7 +50,7 @@
                 tools:text="192.168.43.1/24\n01:23:45:ab:cd:ef"/>
         </LinearLayout>
 
-        <Switch
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/mobile/src/main/res/layout/listitem_repeater.xml b/mobile/src/main/res/layout/listitem_repeater.xml
index 44c62f91..14d393c2 100644
--- a/mobile/src/main/res/layout/listitem_repeater.xml
+++ b/mobile/src/main/res/layout/listitem_repeater.xml
@@ -54,7 +54,7 @@
                     tools:text="192.168.43.1/24\n01:23:45:ab:cd:ef"/>
             </LinearLayout>
 
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
diff --git a/mobile/src/main/res/layout/preference_widget_material_switch.xml b/mobile/src/main/res/layout/preference_widget_material_switch.xml
new file mode 100644
index 00000000..7ede5c1b
--- /dev/null
+++ b/mobile/src/main/res/layout/preference_widget_material_switch.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- https://android.googlesource.com/platform/frameworks/support/+/3c79906/preference/preference/res/layout/preference_widget_switch_compat.xml -->
+
+<!-- Layout used by SwitchPreference for the switch widget style. This is inflated
+     inside android.R.layout.preference. -->
+<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/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 43173fa1..509ba203 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -7,6 +7,9 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorSecondary">@color/colorSecondary</item>
+        <!-- TODO: https://github.com/material-components/material-components-android/issues/2725 -->
+        <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
+        <item name="switchPreferenceCompatStyle">@style/AppTheme.Preference.MaterialSwitchPreference</item>
 
         <!-- Remove ActionBar but keep styles and themes -->
         <item name="windowActionBar">false</item>
@@ -16,6 +19,9 @@
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
     </style>
+    <style name="AppTheme.Preference.MaterialSwitchPreference" parent="Preference.SwitchPreferenceCompat.Material">
+        <item name="android:widgetLayout">@layout/preference_widget_material_switch</item>
+    </style>
 
     <!-- https://android.googlesource.com/platform/packages/apps/Settings/+/7efcc35/res/values/styles.xml -->
     <style name="wifi_item">
diff --git a/mobile/src/main/res/xml/pref_settings.xml b/mobile/src/main/res/xml/pref_settings.xml
index e0d4e0fa..ecb1b7ce 100644
--- a/mobile/src/main/res/xml/pref_settings.xml
+++ b/mobile/src/main/res/xml/pref_settings.xml
@@ -31,19 +31,19 @@
     </PreferenceCategory>
     <PreferenceCategory
         app:title="@string/settings_downstream">
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:key="service.disableIpv6"
             app:icon="@drawable/ic_image_looks_6"
             app:title="@string/settings_service_disable_ipv6"
             app:summary="@string/settings_service_disable_ipv6_summary"
             app:defaultValue="true"/>
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:key="system.enableTetherOffload"
             app:persistent="false"
             app:icon="@drawable/ic_device_battery_charging_full"
             app:title="@string/settings_system_tether_offload"
             app:summary="@string/settings_system_tether_offload_summary"/>
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:key="service.dhcpWorkaround"
             app:icon="@drawable/ic_action_build"
             app:title="@string/settings_service_dhcp_workaround"
@@ -58,12 +58,12 @@
             app:entryValues="@array/settings_service_wifi_lock_values"
             app:title="@string/settings_service_wifi_lock"
             app:useSimpleSummaryProvider="true"/>
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:key="service.autoStart"
             app:icon="@drawable/ic_action_autorenew"
             app:title="@string/settings_service_auto_start"
             app:summary="@string/settings_service_auto_start_summary"/>
-        <SwitchPreference
+        <SwitchPreferenceCompat
             app:key="service.repeater.safeMode"
             app:icon="@drawable/ic_alert_warning"
             app:title="@string/settings_service_repeater_safe_mode"