diff --git a/res/layout/contact_tile_frequent.xml b/res/layout/contact_tile_frequent.xml
index 2e79ba6..52b7126 100644
--- a/res/layout/contact_tile_frequent.xml
+++ b/res/layout/contact_tile_frequent.xml
@@ -17,7 +17,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     class="com.android.contacts.list.ContactTileView"
     android:focusable="true"
-    android:background="@null"
+    android:background="?android:attr/selectableItemBackground"
+    android:nextFocusRight="@+id/contact_tile_quick"
     android:paddingRight="16dip"
     android:paddingLeft="16dip" >
 
@@ -30,6 +31,7 @@
             android:layout_width="64dip"
             android:layout_height="64dip"
             android:scaleType="centerCrop"
+            android:focusable="true"
             android:layout_alignParentRight="true" />
 
         <LinearLayout
diff --git a/res/layout/contact_tile_frequent_phone.xml b/res/layout/contact_tile_frequent_phone.xml
index 563dea0..7d24cef 100644
--- a/res/layout/contact_tile_frequent_phone.xml
+++ b/res/layout/contact_tile_frequent_phone.xml
@@ -14,10 +14,12 @@
      limitations under the License.
 -->
 <view
+    android:id="@+id/contact_tile_frequent_phone"
     xmlns:android="http://schemas.android.com/apk/res/android"
     class="com.android.contacts.list.ContactTileView"
     android:focusable="true"
-    android:background="@null"
+    android:background="?android:attr/selectableItemBackground"
+    android:nextFocusLeft="@+id/contact_tile_quick"
     android:paddingRight="16dip"
     android:paddingLeft="16dip" >
 
@@ -26,10 +28,12 @@
         android:layout_height="match_parent" >
 
         <QuickContactBadge
-            android:id="@+id/contact_tile_quick"
+            android:id="@id/contact_tile_quick"
+            android:nextFocusRight="@id/contact_tile_frequent_phone"
             android:layout_width="64dip"
             android:layout_height="64dip"
             android:scaleType="centerCrop"
+            android:focusable="true"
             android:layout_alignParentLeft="true" />
 
         <TextView
diff --git a/res/layout/contact_tile_starred.xml b/res/layout/contact_tile_starred.xml
index 5fdfe65..757abea 100644
--- a/res/layout/contact_tile_starred.xml
+++ b/res/layout/contact_tile_starred.xml
@@ -70,6 +70,7 @@
             android:id="@+id/contact_tile_push_state"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:focusable="true"
             android:background="?android:attr/selectableItemBackground" />
 
     </RelativeLayout>
diff --git a/res/layout/contact_tile_starred_quick_contact.xml b/res/layout/contact_tile_starred_quick_contact.xml
index 9bb4abe..3f072d1 100644
--- a/res/layout/contact_tile_starred_quick_contact.xml
+++ b/res/layout/contact_tile_starred_quick_contact.xml
@@ -69,6 +69,7 @@
             android:id="@+id/contact_tile_quick"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:focusable="true"
             android:background="@null" />
 
     </RelativeLayout>
diff --git a/res/layout/contact_tile_starred_secondary_target.xml b/res/layout/contact_tile_starred_secondary_target.xml
index e72575e..6543dc1 100644
--- a/res/layout/contact_tile_starred_secondary_target.xml
+++ b/res/layout/contact_tile_starred_secondary_target.xml
@@ -51,10 +51,12 @@
             android:id="@+id/contact_tile_push_state"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:focusable="true"
+            android:nextFocusRight="@+id/contact_tile_secondary_button"
             android:background="?android:attr/selectableItemBackground" />
 
         <ImageButton
-            android:id="@+id/contact_tile_secondary_button"
+            android:id="@id/contact_tile_secondary_button"
             android:src="@drawable/ic_contacts_holo_dark"
             android:background="?android:attr/selectableItemBackground"
             android:layout_height="@dimen/contact_tile_shadowbox_height"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2f74c32..a67aa6b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -256,6 +256,6 @@
     <dimen name="directory_header_height">24dip</dimen>
 
     <!--  Vertical and horizontal padding in between contact tiles -->
-    <dimen name="contact_tile_divider_padding">2dip</dimen>
+    <dimen name="contact_tile_divider_padding">1dip</dimen>
 
 </resources>
diff --git a/src/com/android/contacts/list/ContactTileAdapter.java b/src/com/android/contacts/list/ContactTileAdapter.java
index 37ccded..63d44be 100644
--- a/src/com/android/contacts/list/ContactTileAdapter.java
+++ b/src/com/android/contacts/list/ContactTileAdapter.java
@@ -500,7 +500,6 @@
             } else {
                 contactTile = (ContactTileView) getChildAt(childIndex);
             }
-            contactTile.setClickable(entry != null);
             contactTile.loadFromContact(entry);
 
             switch (mItemViewType) {