diff --git a/res/layout/contact_picker_content.xml b/res/layout/contact_picker_content.xml
index c71314e..36734c5 100644
--- a/res/layout/contact_picker_content.xml
+++ b/res/layout/contact_picker_content.xml
@@ -29,6 +29,8 @@
         android:layout_marginRight="?attr/contact_browser_list_padding_right"
         android:layout_marginStart="?attr/contact_browser_list_padding_left"
         android:layout_marginEnd="?attr/contact_browser_list_padding_right"
+        android:paddingTop="@dimen/contact_browser_list_item_padding_top_or_bottom"
+        android:clipToPadding="false"
         android:fastScrollEnabled="true"/>
 
     <TextView android:id="@android:id/empty"
diff --git a/res/layout/pinned_header_list_demo.xml b/res/layout/pinned_header_list_demo.xml
index 3fc2b79..c717b35 100644
--- a/res/layout/pinned_header_list_demo.xml
+++ b/res/layout/pinned_header_list_demo.xml
@@ -27,6 +27,8 @@
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="0dip"
+        android:paddingTop="@dimen/contact_browser_list_item_padding_top_or_bottom"
+        android:clipToPadding="false"
         android:fastScrollEnabled="true"
         android:layout_weight="1"
     />
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 743e325..2c542ba 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -27,7 +27,6 @@
     <dimen name="search_view_width">400dip</dimen>
     <dimen name="contact_tile_list_padding_top">18dip</dimen>
     <dimen name="contact_browser_list_item_text_size">18sp</dimen>
-    <dimen name="contact_browser_list_item_padding_top_or_bottom">12dp</dimen>
     <dimen name="contact_browser_list_item_photo_size">50dp</dimen>
     <dimen name="contact_browser_list_item_gap_between_image_and_text">25dp</dimen>
     <dimen name="contact_browser_list_top_margin">18dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c63862e..865704f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -198,5 +198,9 @@
     <!-- Width of the box around a tab when the tab has focus -->
     <dimen name="tab_focused_stroke_width">1dp</dimen>
 
-    <dimen name="contact_browser_list_item_padding_top_or_bottom">8dp</dimen>
+    <!-- This value should be kept at (?android:attr/listPreferredItemHeight -
+      @dimen/contact_browser_list_item_photo_size) / 2 or greater. Otherwise, this padding
+      will never take affect inside list items. As a result, the padding at the very top
+      of ListView's will not match the padding inside list items -->
+    <dimen name="contact_browser_list_item_padding_top_or_bottom">12dp</dimen>
 </resources>