diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index 84ea14d34cc..1e320e4009d 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -32,7 +32,9 @@
         android:key="instant_app_buttons"
         android:layout="@layout/instant_app_buttons"
         android:selectable="false"
-        android:order="-9999" />
+        android:order="-9999"
+        settings:allowDividerAbove="true"
+        settings:allowDividerBelow="true"/>
 
     <com.android.settings.widget.ActionButtonPreference
         android:key="action_buttons"
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index cbde0cad8de..14ad180a937 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -24,7 +24,8 @@
 
     <com.android.settings.applications.SpacePreference
         android:key="storage_space"
-        android:layout_height="8dp" />
+        android:layout_height="8dp"
+        settings:allowDividerAbove="true"/>
 
     <Preference
         android:key="storage_used"
@@ -41,7 +42,6 @@
     <PreferenceCategory
         android:key="storage_category"
         android:title="@string/app_info_storage_title"
-        settings:allowDividerAbove="false"
         settings:allowDividerBelow="false">
 
         <Preference
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index 1891702b6eb..c854f777e32 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -23,7 +23,8 @@
         android:key="header_view"
         android:layout="@layout/settings_entity_header"
         android:selectable="false"
-        android:order="-10000"/>
+        android:order="-10000"
+        settings:allowDividerBelow="true"/>
 
     <com.android.settings.widget.ActionButtonPreference
         android:key="action_buttons"