diff --git a/res/layout-v34/settingslib_main_switch_bar.xml b/res/layout-v34/settingslib_main_switch_bar.xml
index aa4cb43c404c0e49116bd9dbac4a877d7c509ad9..3c2444e8f77bc368716f11f4b2a7a43e5e9f40b4 100644
--- a/res/layout-v34/settingslib_main_switch_bar.xml
+++ b/res/layout-v34/settingslib_main_switch_bar.xml
@@ -37,15 +37,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..359a59906fec61fe1912af6b6df161fb874d53ae 100644
--- a/res/layout/long_screen_list_item.xml
+++ b/res/layout/long_screen_list_item.xml
@@ -45,6 +45,5 @@
         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 5ab45c0e7847ec938e2e03cb0fb7073f15f16b93..3c0de3de0d69faeb2b0229942ac148cc89948b46 100644
--- a/res/layout/preference_widget_switch_compat.xml
+++ b/res/layout/preference_widget_switch_compat.xml
@@ -3,12 +3,11 @@
      SPDX-FileCopyrightText: 2023 The Android Open Source Project
      SPDX-License-Identifier: Apache-2.0
 -->
-<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>