diff --git a/res/layout/contact_picker.xml b/res/layout/contact_picker.xml
index 6b03501..c3fe2fa 100644
--- a/res/layout/contact_picker.xml
+++ b/res/layout/contact_picker.xml
@@ -18,8 +18,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     class="com.android.contacts.widget.FullHeightLinearLayout"
     style="@style/ContactPickerLayout"
-    android:paddingLeft="32dip"
-    android:paddingRight="32dip"
+    android:paddingLeft="8dip"
+    android:paddingRight="8dip"
     android:orientation="vertical"
     android:layout_height="match_parent">
     <view
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 7a9e7b2..675dcdb 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -45,4 +45,12 @@
         class="com.android.contacts.list.StrequentContactListFragment"
         android:layout_height="match_parent"
         android:layout_width="match_parent" />
-</FrameLayout>
\ No newline at end of file
+
+    <!-- For phone search UI -->
+    <fragment
+        android:id="@+id/phone_number_picker_fragment"
+        class="com.android.contacts.list.PhoneNumberPickerFragment"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent" />
+
+</FrameLayout>
diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml
index 63d8297..2748923 100644
--- a/res/layout/directory_header.xml
+++ b/res/layout/directory_header.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/DirectoryHeader"
     android:layout_width="match_parent"
-    android:layout_height="56dip"
+    android:layout_height="@dimen/directory_header_height"
     >
     <TextView
         android:id="@+id/count"
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 2d39186..b2f2af1 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -31,4 +31,5 @@
     <dimen name="action_bar_search_spacing">12dip</dimen>
     <dimen name="shortcut_icon_size">64dip</dimen>
     <dimen name="list_section_height">37dip</dimen>
+    <dimen name="directory_header_height">56dip</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f369752..9525f54 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -135,4 +135,7 @@
 
     <!-- Margins for the group detail fragment divider in the header -->
     <dimen name="group_detail_divider_margin">15dip</dimen>
+
+    <!-- Height for directory headers in contact lists -->
+    <dimen name="directory_header_height">28dip</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6c0970f..8fd42b7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,7 +16,6 @@
 <resources>
     <style name="DialtactsTheme" parent="android:Theme.Holo.Light">
         <item name="android:windowContentOverlay">@null</item>
-        <item name="list_item_height">?android:attr/listPreferredItemHeight</item>
         <item name="activated_background">@drawable/list_item_activated_background</item>
         <item name="section_header_background">@drawable/list_title_holo</item>
         <item name="list_section_header_height">32dip</item>
@@ -189,7 +188,7 @@
         <item name="contact_filter_popup_width">320dip</item>
     </style>
 
-    <style name="ContactPickerTheme" parent="@android:Theme">
+    <style name="ContactPickerTheme" parent="@android:Theme.Holo.Light">
         <item name="section_header_background">@drawable/section_header</item>
         <item name="list_item_divider">@drawable/list_item_divider</item>
         <item name="list_item_padding_top">4dip</item>