diff --git a/res/layout/preference_with_button.xml b/res/layout/preference_with_button.xml
index 01fc1a73..285d0598 100644
--- a/res/layout/preference_with_button.xml
+++ b/res/layout/preference_with_button.xml
@@ -24,28 +24,23 @@
     android:gravity="center_vertical"
     android:paddingEnd="?android:attr/scrollbarSize"
     android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip"
+    android:paddingLeft="12dip"
     android:background="?attr/selectableItemBackground">
 
-    <!-- Preference should place its actual preference widget here. -->
+    <!-- Preference will 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="center_vertical"
         android:orientation="vertical" />
 
-    <ImageView
-        android:id="@+android:id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        />
-
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dip"
-        android:layout_marginLeft="15dip"
-        android:layout_marginEnd="15dip"
+        android:layout_marginStart="12dip"
+        android:layout_marginLeft="12dip"
+        android:layout_marginEnd="4dip"
         android:layout_marginRight="4dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"