diff --git a/res/layout/accessibility_autoclick_custom_seekbar.xml b/res/layout/accessibility_autoclick_custom_seekbar.xml
index df6d7c873a4..01c9a069c63 100644
--- a/res/layout/accessibility_autoclick_custom_seekbar.xml
+++ b/res/layout/accessibility_autoclick_custom_seekbar.xml
@@ -20,7 +20,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="60dp"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
@@ -29,11 +28,13 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:accessibilityLiveRegion="polite"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="12dp"
         android:gravity="center_vertical">
 
         <ImageView
diff --git a/res/layout/battery_saver_schedule_percentage_seekbar.xml b/res/layout/battery_saver_schedule_percentage_seekbar.xml
deleted file mode 100644
index 78628220cdb..00000000000
--- a/res/layout/battery_saver_schedule_percentage_seekbar.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 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.
--->
-
-<!-- Layout used by BatterySaverScheduleSeekBarController for the seekbar widget. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginVertical="6dp"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-  <TextView
-      android:id="@android:id/title"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:ellipsize="marquee"
-      android:layout_marginStart="18dp"
-      android:singleLine="true"
-      android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-      android:textColor="?android:attr/textColorPrimary" />
-
-  <com.android.settings.widget.DefaultIndicatorSeekBar
-      android:id="@*android:id/seekbar"
-      style="@android:style/Widget.Material.SeekBar.Discrete"
-      android:layout_width="match_parent"
-      android:layout_height="48dp"
-      android:layout_marginStart="18dp"
-      android:layout_marginEnd="9dp" />
-
-</LinearLayout>
diff --git a/res/layout/preference_balance_slider.xml b/res/layout/preference_balance_slider.xml
index 93e192aedc4..3a960e726b2 100644
--- a/res/layout/preference_balance_slider.xml
+++ b/res/layout/preference_balance_slider.xml
@@ -25,28 +25,13 @@
     android:clickable="false"
     android:orientation="horizontal">
 
-    <LinearLayout
-        android:id="@+id/icon_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="56dp"
-        android:gravity="start|center_vertical"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp">
-        <com.android.internal.widget.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"/>
-    </LinearLayout>
+    <include layout="@layout/settingslib_icon_frame"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp">
+        android:paddingTop="16dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -57,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:singleLine="true"
-                android:textAppearance="@*android:style/TextAppearance.Material.Subhead"
+                android:textAppearance="?android:attr/textAppearanceListItem"
                 android:textColor="?android:attr/textColorPrimary"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"/>
diff --git a/res/layout/preference_labeled_slider.xml b/res/layout/preference_labeled_slider.xml
index 42ad988d957..87230f7f280 100644
--- a/res/layout/preference_labeled_slider.xml
+++ b/res/layout/preference_labeled_slider.xml
@@ -21,8 +21,8 @@
     android:gravity="center_vertical"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="56dp"
-    android:paddingEnd="8dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="16dp"
     android:paddingBottom="8dp">
 
@@ -30,12 +30,11 @@
         android:id="@android:id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
         android:layout_alignParentTop="true"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal"
         android:singleLine="true"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+        android:textAppearance="?android:attr/textAppearanceListItem"
         android:textColor="?android:attr/textColorPrimary" />
 
     <SeekBar
@@ -43,21 +42,19 @@
         android:layout_below="@android:id/title"
         android:layout_gravity="center_vertical"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_marginTop="-20dp"
-        android:layout_marginBottom="-28dp"
+        android:layout_height="48dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp"
         style="@android:style/Widget.Material.SeekBar.Discrete" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@*android:id/seekbar"
-        android:paddingBottom="8dp"
         android:orientation="horizontal">
 
         <TextView
             android:id="@android:id/text1"
-            android:layout_marginStart="16dp"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="start|top"
@@ -66,7 +63,6 @@
 
         <TextView
             android:id="@android:id/text2"
-            android:layout_marginEnd="16dp"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="end|top"
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 7c07d5eeca5..c1aae7048b7 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -25,28 +25,13 @@
     android:clickable="false"
     android:orientation="horizontal">
 
-    <LinearLayout
-        android:id="@+id/icon_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="44dp"
-        android:gravity="start|center_vertical"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp">
-        <com.android.internal.widget.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"/>
-    </LinearLayout>
+    <include layout="@layout/settingslib_icon_frame"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp">
+        android:paddingTop="16dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -56,9 +41,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:paddingStart="12dp"
                 android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.PreferenceTitle.SettingsLib"
+                android:textAppearance="?android:attr/textAppearanceListItem"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"/>
             <!-- Preference should place its actual preference widget here. -->
@@ -79,7 +63,8 @@
             <SeekBar
                 android:id="@*android:id/seekbar"
                 android:layout_gravity="center_vertical"
-                android:paddingStart="12dp"
+                android:paddingStart="0dp"
+                android:paddingEnd="0dp"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"/>
 
@@ -87,7 +72,6 @@
                 android:id="@+id/suppression_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="12dp"
                 android:layout_gravity="center_vertical|start"
                 android:textAlignment="viewStart"
                 android:singleLine="true"
diff --git a/res/layout/preference_widget_seekbar_settings.xml b/res/layout/preference_widget_seekbar_settings.xml
index 9893a1bdf22..811e831d929 100644
--- a/res/layout/preference_widget_seekbar_settings.xml
+++ b/res/layout/preference_widget_seekbar_settings.xml
@@ -15,49 +15,55 @@
 -->
 
 <!-- Layout used by SeekBarPreference for the seekbar widget style. -->
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="6dp"
-    android:layout_marginBottom="6dp"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:clickable="false"
+    android:orientation="horizontal">
 
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"
-        android:paddingStart="56dp"
-        android:paddingEnd="8dp"
-        android:singleLine="true"
-        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-        android:textColor="?android:attr/textColorPrimary" />
+    <include layout="@layout/settingslib_icon_frame"/>
 
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@android:id/title"
-        android:layout_below="@android:id/title"
-        android:maxLines="4"
-        android:paddingStart="56dp"
-        android:paddingEnd="8dp"
-        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary" />
-
-    <com.android.settings.widget.DefaultIndicatorSeekBar
-        android:id="@*android:id/seekbar"
-        style="@android:style/Widget.Material.SeekBar.Discrete"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@android:id/summary"
-        android:paddingStart="56dp"
-        android:paddingEnd="12dp" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="16dp">
 
-</RelativeLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@android:id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                android:textColor="?android:attr/textColorPrimary"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"/>
+            <!-- Preference should place its actual preference widget here. -->
+            <LinearLayout
+                android:id="@android:id/widget_frame"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="end|center_vertical"
+                android:paddingStart="12dp"
+                android:orientation="vertical"/>
+        </LinearLayout>
+
+        <SeekBar
+            android:id="@*android:id/seekbar"
+            android:layout_gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
+            android:layout_height="48dp"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 1c8d0153db9..5d162a8b8fe 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -46,6 +46,7 @@
 
     <style name="SettingsSeekBarPreference" parent="@style/Preference.Material">
         <item name="android:layout">@layout/preference_widget_seekbar_settings</item>
+        <item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>
     </style>
 
     <style name="SyncSwitchPreference" parent="@style/SettingsSwitchPreference.SettingsLib">
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
index fea3d60f777..173d946761a 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
@@ -55,7 +55,8 @@ public class BatterySaverScheduleSeekBarController implements
     public BatterySaverScheduleSeekBarController(Context context) {
         mContext = context;
         mSeekBarPreference = new SeekBarPreference(context);
-        mSeekBarPreference.setLayoutResource(R.layout.battery_saver_schedule_percentage_seekbar);
+        mSeekBarPreference.setLayoutResource(R.layout.preference_widget_seekbar_settings);
+        mSeekBarPreference.setIconSpaceReserved(false);
         mSeekBarPreference.setOnPreferenceChangeListener(this);
         mSeekBarPreference.setContinuousUpdates(true);
         mSeekBarPreference.setMax(MAX_SEEKBAR_VALUE);