diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 0eac5f954e9..b84aa3822ba 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -71,6 +71,7 @@
         android:visibility="gone">
 
         <Button android:id="@+id/back_button"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
@@ -85,7 +86,8 @@
             android:layout_alignParentEnd="true">
 
             <Button android:id="@+id/skip_button"
-                android:layout_width="150dip"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dip"
                 android:text="@*android:string/skip_button_label"
@@ -93,7 +95,8 @@
                 />
 
             <Button android:id="@+id/next_button"
-                android:layout_width="150dip"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dip"
                 android:text="@*android:string/next_button_label"
diff --git a/src/com/android/settings/deletionhelper/DeletionHelperFragment.java b/src/com/android/settings/deletionhelper/DeletionHelperFragment.java
index e6b99df21c4..68144f8875a 100644
--- a/src/com/android/settings/deletionhelper/DeletionHelperFragment.java
+++ b/src/com/android/settings/deletionhelper/DeletionHelperFragment.java
@@ -25,7 +25,9 @@ import android.text.format.Formatter;
 import android.util.ArraySet;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import com.android.settings.deletionhelper.DownloadsDeletionPreference;
 import com.android.settings.CollapsibleCheckboxPreferenceGroup;
 import com.android.settings.PhotosDeletionPreference;
@@ -113,13 +115,17 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
     }
 
     private void initializeButtons(View v) {
-        mCancel = (Button) v.findViewById(R.id.back_button);
+        mCancel = (Button) v.findViewById(R.id.skip_button);
         mCancel.setText(R.string.cancel);
         mCancel.setOnClickListener(this);
+        mCancel.setVisibility(View.VISIBLE);
 
         mFree = (Button) v.findViewById(R.id.next_button);
         mFree.setText(R.string.storage_menu_free);
         mFree.setOnClickListener(this);
+
+        Button back = (Button) v.findViewById(R.id.back_button);
+        back.setVisibility(View.GONE);
     }
 
     private void initializeDeletionPreferences() {