diff --git a/res/drawable/clock_color_size_button_background_base.xml b/res/drawable/clock_color_size_button_background_base.xml
index 2e6f2be5e3eb9f93aec0d2c610162f48a11c450c..e29b9f2a00a4500756a676698fac01ea165775d5 100644
--- a/res/drawable/clock_color_size_button_background_base.xml
+++ b/res/drawable/clock_color_size_button_background_base.xml
@@ -17,5 +17,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/clock_color_size_button_corner_radius" />
-    <solid android:color="@color/color_surface" />
+    <solid android:color="@*android:color/e_floating_background_variant" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/option_border.xml b/res/drawable/option_border.xml
index d0fde5cab177c638fe6c68fa36b19ecd65a855da..fce16663392d0a1a3e2101bd492ba6d298ffcad3 100644
--- a/res/drawable/option_border.xml
+++ b/res/drawable/option_border.xml
@@ -23,7 +23,7 @@
     </item>
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/color_surface"/>
+            <solid android:color="@*android:color/e_floating_background_variant"/>
             <corners android:radius="@dimen/option_tile_radius" />
         </shape>
     </item>
diff --git a/res/layout/dark_mode_section_view.xml b/res/layout/dark_mode_section_view.xml
index 7eae574aaa896fa90ea32729e7f3766c97c6ab80..be7385dd2cd2ddc291ae7e93d86a6d3a5d9545b2 100644
--- a/res/layout/dark_mode_section_view.xml
+++ b/res/layout/dark_mode_section_view.xml
@@ -33,14 +33,13 @@
         android:text="@string/mode_title"
         style="@style/SectionTitleTextStyle" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
+    <Switch
         android:id="@+id/dark_mode_toggle"
         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:minHeight="0dp"
         android:text=""
         android:textOn=""
diff --git a/res/layout/notification_section.xml b/res/layout/notification_section.xml
index 1e2e1cf3d554da3f6f1c5ea23b8da9a1c746fc3d..61c617d6f4af93e867da9c9ac43d1e3dc30d399f 100644
--- a/res/layout/notification_section.xml
+++ b/res/layout/notification_section.xml
@@ -35,7 +35,7 @@
         android:paddingEnd="@dimen/notification_section_title_padding"
         style="@style/SectionTitleTextStyle"/>
 
-    <com.google.android.material.materialswitch.MaterialSwitch
+    <Switch
         android:id="@+id/switcher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,7 +43,6 @@
         android:background="@null"
         android:focusable="false"
         android:clickable="false"
-        android:theme="@style/Theme.Material3.DynamicColors.DayNight"
         android:text=""
         android:textOn=""
         android:textOff="" />
diff --git a/res/layout/themed_icon_section_view.xml b/res/layout/themed_icon_section_view.xml
index 6731cbe26bd30ba43b7cd953179fc3bcac3fd447..9799df32c809f2f91615e1d322cf7d9871c7bb47 100644
--- a/res/layout/themed_icon_section_view.xml
+++ b/res/layout/themed_icon_section_view.xml
@@ -39,14 +39,13 @@
             android:text="@string/themed_icon_title"
             style="@style/SectionTitleTextStyle" />
 
-        <com.google.android.material.materialswitch.MaterialSwitch
+        <Switch
             android:id="@+id/themed_icon_toggle"
             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:minHeight="0dp"
             android:text=""
             android:textOn=""
diff --git a/src/com/android/customization/model/mode/DarkModeSectionController.java b/src/com/android/customization/model/mode/DarkModeSectionController.java
index 5e6c95bed18e731607d9684e324f36d7f0621a0b..3da7ae9a371e7c5d8736d488cc32f66ee4625f47 100644
--- a/src/com/android/customization/model/mode/DarkModeSectionController.java
+++ b/src/com/android/customization/model/mode/DarkModeSectionController.java
@@ -30,6 +30,7 @@ import android.os.Looper;
 import android.os.PowerManager;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.widget.Switch;
 import android.widget.Toast;
 
 import androidx.annotation.MainThread;
@@ -42,7 +43,6 @@ import com.android.customization.module.logging.ThemesUserEventLogger;
 import com.android.customization.picker.mode.DarkModeSectionView;
 import com.android.themepicker.R;
 import com.android.wallpaper.model.CustomizationSectionController;
-import com.google.android.material.materialswitch.MaterialSwitch;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -127,7 +127,7 @@ public class DarkModeSectionController implements
         if (context == null) {
             return;
         }
-        MaterialSwitch switchView = mDarkModeSectionView.findViewById(R.id.dark_mode_toggle);
+        Switch switchView = mDarkModeSectionView.findViewById(R.id.dark_mode_toggle);
         if (!switchView.isEnabled()) {
             Toast disableToast = Toast.makeText(mContext,
                     mContext.getString(R.string.mode_disabled_msg), Toast.LENGTH_SHORT);
diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java
index 840c472e72fc9d418dd64406949a0c86ab725404..74704364da5645b2419fd2634b299972722f56a5 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -145,23 +145,13 @@ public final class DefaultCustomizationSections implements CustomizationSections
                                 customizationPickerViewModel));
 
         sectionControllers.add(
-                new ConnectedSectionController(
-                        // Theme color section.
-                        new ColorSectionController(
-                                sectionNavigationController,
-                                new ViewModelProvider(
-                                        activity,
-                                        mColorPickerViewModelFactory)
-                                        .get(ColorPickerViewModel.class),
-                                lifecycleOwner),
-                        // Wallpaper quick switch section.
-                        new WallpaperQuickSwitchSectionController(
-                                customizationPickerViewModel.getWallpaperQuickSwitchViewModel(
-                                        screen),
-                                lifecycleOwner,
-                                sectionNavigationController,
-                                savedInstanceState == null),
-                        /* reverseOrderWhenHorizontal= */ true));
+                // Wallpaper quick switch section.
+                new WallpaperQuickSwitchSectionController(
+                        customizationPickerViewModel.getWallpaperQuickSwitchViewModel(
+                                screen),
+                        lifecycleOwner,
+                        sectionNavigationController,
+                        savedInstanceState == null));
 
         switch (screen) {
             case LOCK_SCREEN:
diff --git a/src/com/android/customization/picker/mode/DarkModeSectionView.java b/src/com/android/customization/picker/mode/DarkModeSectionView.java
index 2e7dbca689b19e5c09a44a6fc37f4cd6740e15da..f4d3bcd2b44d93e89cc458b7bf72079995358bd0 100644
--- a/src/com/android/customization/picker/mode/DarkModeSectionView.java
+++ b/src/com/android/customization/picker/mode/DarkModeSectionView.java
@@ -17,13 +17,13 @@ package com.android.customization.picker.mode;
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.widget.Switch;
 import android.util.AttributeSet;
 
 import androidx.annotation.Nullable;
 
 import com.android.themepicker.R;
 import com.android.wallpaper.picker.SectionView;
-import com.google.android.material.materialswitch.MaterialSwitch;
 
 /** The view of section in the customization picker fragment. */
 public final class DarkModeSectionView extends SectionView {
@@ -40,7 +40,7 @@ public final class DarkModeSectionView extends SectionView {
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        MaterialSwitch switchView = findViewById(R.id.dark_mode_toggle);
+        Switch switchView = findViewById(R.id.dark_mode_toggle);
         switchView.setChecked(mIsDarkModeActivated);
         switchView.setOnCheckedChangeListener((buttonView, isChecked) ->
                 switchView.setChecked(mIsDarkModeActivated)
diff --git a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt
index e4b2ce576296a52f6709de07a7f7d3ba96b8c4db..36db68c6308fbc9bddd1af57504e225d12bfed3d 100644
--- a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt
+++ b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt
@@ -19,13 +19,13 @@ package com.android.customization.picker.notifications.ui.binder
 
 import android.annotation.SuppressLint
 import android.view.View
+import android.widget.Switch;
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel
 import com.android.themepicker.R
-import com.google.android.material.materialswitch.MaterialSwitch
 import kotlinx.coroutines.launch
 
 /**
@@ -38,7 +38,7 @@ object NotificationSectionBinder {
         viewModel: NotificationSectionViewModel,
         lifecycleOwner: LifecycleOwner,
     ) {
-        val switch: MaterialSwitch = view.requireViewById(R.id.switcher)
+        val switch: Switch = view.requireViewById(R.id.switcher)
 
         view.setOnClickListener { viewModel.onClicked() }
 
diff --git a/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java b/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java
index 5b379a9cf0c8edccd56cf972af72d5c904e86ad5..2bbe74ee0ce820e83e45c60e55e957572bac7625 100644
--- a/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java
+++ b/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java
@@ -17,19 +17,19 @@ package com.android.customization.picker.themedicon;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.widget.Switch;
 
 import androidx.annotation.Nullable;
 
 import com.android.themepicker.R;
 import com.android.wallpaper.picker.SectionView;
-import com.google.android.material.materialswitch.MaterialSwitch;
 
 /**
  * The {@link SectionView} for themed icon section view
  */
 public class ThemedIconSectionView extends SectionView {
 
-    private MaterialSwitch mSwitchView;
+    private Switch mSwitchView;
 
     public ThemedIconSectionView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
@@ -49,7 +49,7 @@ public class ThemedIconSectionView extends SectionView {
     }
 
     /** Gets the switch view. */
-    public MaterialSwitch getSwitch() {
+    public Switch getSwitch() {
         return mSwitchView;
     }
 }