diff --git a/Android.bp b/Android.bp
index 604eb60..3225144 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,6 +81,7 @@ android_app {
         "com.android.vcard",
         "guava",
         "libphonenumber",
+        "com.google.android.material_material",
     ],
 
     aaptflags: [
diff --git a/res/layout/preference_material_switch.xml b/res/layout/preference_material_switch.xml
new file mode 100644
index 0000000..6600fca
--- /dev/null
+++ b/res/layout/preference_material_switch.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2023 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<com.google.android.material.materialswitch.MaterialSwitch
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:theme="@style/Theme.Material3.DynamicColors.DayNight"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3f9df48..0cf841b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -35,6 +35,7 @@
          <item name="android:textColorHighlight">@color/text_highlight_color</item>
          <item name="actionBarStyle">@style/BugleActionBar</item>
          <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
     </style>
 
     <style name="LaunchTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
@@ -638,4 +639,13 @@
         <item name="android:background">@color/window_background</item>
         <item name="dialogCornerRadius">28dp</item>
     </style>
+
+    <style name="AppPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
+        <item name="switchPreferenceCompatStyle">@style/AppSwitchPreference</item>
+    </style>
+
+    <style name="AppSwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/preference_material_switch</item>
+    </style>
+
 </resources>
diff --git a/res/xml/preferences_application.xml b/res/xml/preferences_application.xml
index 323fce3..6b859b8 100644
--- a/res/xml/preferences_application.xml
+++ b/res/xml/preferences_application.xml
@@ -37,7 +37,7 @@
         </intent>
     </PreferenceScreen>
 
-    <CheckBoxPreference
+    <SwitchPreferenceCompat
         android:key="@string/send_sound_pref_key"
         android:title="@string/send_sound_pref_title"
         android:defaultValue="@bool/send_sound_pref_default"
@@ -48,7 +48,7 @@
         android:title="@string/notifications_pref_title"
         android:persistent="true" />
 
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:key="@string/swipe_right_deletes_conversation_key"
         android:title="@string/swipe_to_delete_conversation_pref_title"
         android:summary="@string/swipe_to_delete_conversation_pref_summary"
diff --git a/res/xml/preferences_per_subscription.xml b/res/xml/preferences_per_subscription.xml
index 187c7c2..d4b818c 100644
--- a/res/xml/preferences_per_subscription.xml
+++ b/res/xml/preferences_per_subscription.xml
@@ -30,13 +30,13 @@
             android:key="@string/mms_phone_number_pref_key"
             android:title="@string/mms_phone_number_pref_title" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:key="@string/auto_retrieve_mms_pref_key"
             android:title="@string/auto_retrieve_mms_pref_title"
             android:summary="@string/auto_retrieve_mms_pref_summary"
             android:defaultValue="@bool/auto_retrieve_mms_pref_default" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:key="@string/auto_retrieve_mms_when_roaming_pref_key"
             android:dependency="@string/auto_retrieve_mms_pref_key"
             android:title="@string/auto_retrieve_mms_when_roaming_pref_title"
@@ -49,7 +49,7 @@
         android:key="@string/advanced_category_pref_key"
         android:title="@string/advanced_category_pref_title">
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:key="@string/delivery_reports_pref_key"
             android:title="@string/delivery_reports_pref_title"
             android:summary="@string/delivery_reports_pref_summary"
diff --git a/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java b/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java
index 03c94be..af6023d 100644
--- a/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java
+++ b/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java
@@ -30,7 +30,7 @@ import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
+import androidx.preference.SwitchPreferenceCompat;
 
 import com.android.messaging.R;
 import com.android.messaging.ui.BugleActionBarActivity;
@@ -89,7 +89,7 @@ public class ApplicationSettingsActivity extends BugleActionBarActivity {
         private Preference mSmsEnabledPreference;
         private boolean mIsSmsPreferenceClicked;
         private String mSwipeRightToDeleteConversationkey;
-        private SwitchPreference mSwipeRightToDeleteConversationPreference;
+        private SwitchPreferenceCompat mSwipeRightToDeleteConversationPreference;
 
         public ApplicationSettingsFragment() {
             // Required empty constructor
@@ -111,7 +111,7 @@ public class ApplicationSettingsActivity extends BugleActionBarActivity {
             mSwipeRightToDeleteConversationkey = getString(
                     R.string.swipe_right_deletes_conversation_key);
             mSwipeRightToDeleteConversationPreference =
-                    (SwitchPreference) findPreference(mSwipeRightToDeleteConversationkey);
+                    (SwitchPreferenceCompat) findPreference(mSwipeRightToDeleteConversationkey);
             mIsSmsPreferenceClicked = false;
 
             final PreferenceScreen advancedScreen = (PreferenceScreen) findPreference(