diff --git a/res/layout/restricted_preference_dropdown.xml b/res/layout/restricted_preference_dropdown.xml
index 86053bf1eac..8930e24bb28 100644
--- a/res/layout/restricted_preference_dropdown.xml
+++ b/res/layout/restricted_preference_dropdown.xml
@@ -26,6 +26,6 @@
             android:visibility="invisible"
             android:layout_marginStart="@dimen/preference_no_icon_padding_start"/>
 
-    <include layout="@layout/preference_material" />
+    <include layout="@layout/settingslib_preference" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index 2bca90e20a4..6b8547a0dd2 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -31,5 +31,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_toStartOf="@id/widget_summary"
-        layout="@layout/preference_material"/>
+        layout="@layout/preference_app"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index 6de2d510b17..40796f7b373 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -35,22 +35,7 @@
         android:clipToPadding="false"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart">
 
-        <LinearLayout
-            android:id="@+id/icon_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
-            android:minWidth="56dp"
-            android:orientation="horizontal"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp">
-            <com.android.internal.widget.PreferenceImageView
-                android:id="@android:id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="24dp"
-                android:maxHeight="24dp"/>
-        </LinearLayout>
+        <include layout="@layout/settingslib_icon_frame"/>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 42ed0e989e9..ea2900f2ebe 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -59,6 +59,7 @@
     <style name="SettingsMultiSelectListPreference" parent="@style/Preference.Material">
         <item name="android:positiveButtonText">@android:string/ok</item>
         <item name="android:negativeButtonText">@android:string/cancel</item>
+        <item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>
     </style>
 
     <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material">
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 8588f8b0d18..0ec1a6166b5 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -163,7 +163,7 @@
             android:title="@string/call_category"
             settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController">
 
-            <PreferenceScreen
+            <Preference
                 android:key="wifi_calling"
                 android:title="@string/wifi_calling_settings_title"
                 android:summary="@string/wifi_calling_summary"
@@ -173,7 +173,7 @@
                         android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
                     <extra android:name="show_drawer_menu" android:value="true"/>
                 </intent>
-            </PreferenceScreen>
+            </Preference>
 
             <SwitchPreference
                 android:key="video_calling_key"
diff --git a/src/com/android/settings/applications/intentpicker/VerifiedLinksPreference.java b/src/com/android/settings/applications/intentpicker/VerifiedLinksPreference.java
index 5452a2a307d..fdfe215f83f 100644
--- a/src/com/android/settings/applications/intentpicker/VerifiedLinksPreference.java
+++ b/src/com/android/settings/applications/intentpicker/VerifiedLinksPreference.java
@@ -89,7 +89,7 @@ public class VerifiedLinksPreference extends TwoTargetPreference {
         CheckBox checkBox = (CheckBox) view.findViewById(com.android.internal.R.id.checkbox);
         if (checkBox != null) {
             checkBox.setChecked(true);
-            checkBox.setVisibility(mShowCheckBox ? View.VISIBLE : View.INVISIBLE);
+            checkboxContainer.setVisibility(mShowCheckBox ? View.VISIBLE : View.GONE);
         }
     }
 }