diff --git a/res/xml/app_info_settings_v2.xml b/res/xml/app_info_settings_v2.xml
index 8b9cf4f60e2..b4a82e0a3f3 100644
--- a/res/xml/app_info_settings_v2.xml
+++ b/res/xml/app_info_settings_v2.xml
@@ -24,27 +24,18 @@
         android:key="header_view"
         android:layout="@layout/settings_entity_header"
         android:selectable="false"
-        android:order="-10000"
-        settings:allowDividerBelow="true"/>
+        android:order="-10000" />
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="instant_app_buttons"
         android:layout="@layout/instant_app_buttons"
         android:selectable="false"
-        android:order="-9999"
-        settings:allowDividerAbove="true"
-        settings:allowDividerBelow="true"/>
+        android:order="-9999" />
 
     <com.android.settingslib.widget.ActionButtonsPreference
         android:key="action_buttons"
         android:order="-9998" />
 
-    <!-- Add SpacePreference to draw divider -->
-    <com.android.settings.applications.SpacePreference
-        android:layout_height="0dp"
-        android:order="-9997"
-        settings:allowDividerAbove="true" />
-
     <Preference
         android:key="app_settings_link"
         android:title="@string/app_settings_link"
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index 6092dbbece2..6ffc375d47d 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -22,11 +22,6 @@
     <com.android.settingslib.widget.ActionButtonsPreference
         android:key="header_view" />
 
-    <com.android.settings.applications.SpacePreference
-        android:key="storage_space"
-        android:layout_height="8dp"
-        settings:allowDividerAbove="true"/>
-
     <Preference
         android:key="storage_used"
         android:title="@string/storage_used"
@@ -41,8 +36,7 @@
 
     <PreferenceCategory
         android:key="storage_category"
-        android:title="@string/app_info_storage_title"
-        settings:allowDividerAbove="true">
+        android:title="@string/app_info_storage_title">
 
         <Preference
             android:key="app_size"