diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index 2a67d6b98b8..02aa567cab2 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -19,9 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="40dip"
     android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:gravity="center_vertical">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index 0a8006b3a1a..bc92c34600c 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -19,7 +19,9 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:clipChildren="false"
-    android:clipToPadding="false">
+    android:clipToPadding="false"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <FrameLayout
         android:id="@+id/network_switches_container"
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index ef4444a8c7f..964567981eb 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -19,8 +19,6 @@
     android:layout_height="wrap_content"
     android:minHeight="48dip"
     android:gravity="center_vertical"
-    android:paddingStart="@*android:dimen/preference_item_padding_side"
-    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground">
 
     <RelativeLayout