diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0783c65..fa95e9d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1149,7 +1149,8 @@
         </activity>
 
         <activity android:name="Settings$QuickLaunchSettingsActivity"
-                android:label="@string/quick_launch_title">
+                android:label="@string/quick_launch_title"
+                android:theme="@style/Theme.SubSettingsDialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.QUICK_LAUNCH_SETTINGS" />
@@ -1163,7 +1164,9 @@
                        android:value="true" />
         </activity>
 
-        <activity android:name=".quicklaunch.BookmarkPicker" android:label="@string/quick_launch_title">
+        <activity android:name=".quicklaunch.BookmarkPicker"
+                  android:label="@string/quick_launch_title"
+                  android:theme="@style/Theme.SubSettingsDialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index 113e83a..ad491ff 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -20,7 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="2dip"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:gravity="center_vertical">
 
     <ImageView android:id="@+id/icon"
diff --git a/res/layout/preference_widget_shortcut.xml b/res/layout/preference_widget_shortcut.xml
index 1a885a2..81ccaa1 100644
--- a/res/layout/preference_widget_shortcut.xml
+++ b/res/layout/preference_widget_shortcut.xml
@@ -16,10 +16,8 @@
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/shortcut" 
-    android:layout_width="40dip"
-    android:layout_height="40dip"
-    android:layout_marginEnd="4sp"
-    android:layout_gravity="center_vertical"
-    android:background="#555555"
+    android:layout_width="48dip"
+    android:layout_height="48dip"
     android:gravity="center"
+    android:background="@*android:drawable/btn_default_material"
     android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/src/com/android/settings/quicklaunch/BookmarkPicker.java b/src/com/android/settings/quicklaunch/BookmarkPicker.java
index 7152abb..32594b6 100644
--- a/src/com/android/settings/quicklaunch/BookmarkPicker.java
+++ b/src/com/android/settings/quicklaunch/BookmarkPicker.java
@@ -97,7 +97,7 @@
 
         updateListAndAdapter();
     }
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, DISPLAY_MODE_LAUNCH, 0, R.string.quick_launch_display_mode_applications)