diff --git a/res/layout-v34/settingslib_main_switch_bar.xml b/res/layout-v34/settingslib_main_switch_bar.xml
index 3a44d2ae86fc779c7c08e52cdb8413e26269b973..4fb9fb5c2f235f97084244400a1d6225144c52ce 100644
--- a/res/layout-v34/settingslib_main_switch_bar.xml
+++ b/res/layout-v34/settingslib_main_switch_bar.xml
@@ -49,15 +49,14 @@
             android:lineBreakWordStyle="phrase"
             style="@style/MainSwitchText.Settingslib" />
 
-        <com.google.android.material.materialswitch.MaterialSwitch
+        <Switch
             android:id="@android:id/switch_widget"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:background="@null"
             android:clickable="false"
-            android:focusable="false"
-            android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
+            android:focusable="false" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/long_screen_list_item.xml b/res/layout/long_screen_list_item.xml
index 9afe9bcfeb1b421dacc83c56de3e11e656f3ff80..e00015ca455021c501f4aeca09f2059123e3de7f 100644
--- a/res/layout/long_screen_list_item.xml
+++ b/res/layout/long_screen_list_item.xml
@@ -40,11 +40,10 @@
 
     </LinearLayout>
 
-    <com.google.android.material.materialswitch.MaterialSwitch
+    <Switch
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/state"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@null"
-        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
+        android:background="@null" />
 </LinearLayout>
diff --git a/res/layout/preference_widget_switch_compat.xml b/res/layout/preference_widget_switch_compat.xml
index e833171d5daa1986b26a5c19fc029803f332b7c1..c52a05294f848358d44e1e6b04a072b9acebe520 100644
--- a/res/layout/preference_widget_switch_compat.xml
+++ b/res/layout/preference_widget_switch_compat.xml
@@ -15,12 +15,11 @@
   ~ limitations under the License.
   -->
 
-<com.google.android.material.materialswitch.MaterialSwitch
+<Switch
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/switchWidget"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@null"
     android:clickable="false"
-    android:focusable="false"
-    android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
+    android:focusable="false" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index be39ae505c742c90ab6dddfd54115a440f3b048d..0348b1840eeb7a109ab15d7f8695cd39c7e7a673 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,7 +31,7 @@
     </style>
 
     <style name="OnBoardingStyle" parent="Theme.AppCompat.DayNight">
-        <item name="colorAccent">#167c80</item>
+        <item name="colorAccent">@*android:color/accent_device_default</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
@@ -43,7 +43,7 @@
 
     <style name="PrimaryButtonStyle" parent="ThemeOverlay.Material3.Button">
         <item name="android:background">@drawable/button_background</item>
-        <item name="android:textColor">@android:color/black</item>
+        <item name="android:textColor">?android:attr/colorBackground</item>
     </style>
 
 </resources>