Merge "Align list header text with bar title and avatars"
diff --git a/res-common/layout/account_filter_header.xml b/res-common/layout/account_filter_header.xml
index c4b729c..72ca8fd 100644
--- a/res-common/layout/account_filter_header.xml
+++ b/res-common/layout/account_filter_header.xml
@@ -31,7 +31,7 @@
         android:id="@+id/account_filter_icon"
         android:layout_height="@dimen/contact_browser_list_header_icon_size"
         android:layout_width="@dimen/contact_browser_list_header_icon_size"
-        android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
+        android:layout_marginStart="@dimen/contact_browser_list_header_icon_left_margin"
         android:layout_gravity="center_vertical"/>
 
     <TextView
diff --git a/res-common/values-sw600dp/dimens.xml b/res-common/values-sw600dp/dimens.xml
index 2e64fd9..cf736f7 100644
--- a/res-common/values-sw600dp/dimens.xml
+++ b/res-common/values-sw600dp/dimens.xml
@@ -20,6 +20,7 @@
     <dimen name="contact_browser_list_header_left_margin">@dimen/list_visible_scrollbar_padding</dimen>
     <dimen name="contact_browser_list_header_right_margin">24dip</dimen>
     <dimen name="contact_browser_list_top_margin">16dip</dimen>
+    <dimen name="contact_browser_list_header_text_margin">32dp</dimen>
 
     <!-- Right margin of the floating action button -->
     <dimen name="floating_action_button_margin_right">32dp</dimen>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 11126d4..fa82570 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -49,12 +49,13 @@
     <!-- Padding to be used between a visible scrollbar and the contact list -->
     <dimen name="list_visible_scrollbar_padding">32dip</dimen>
 
+    <dimen name="contact_browser_list_header_icon_left_margin">16dp</dimen>
     <dimen name="contact_browser_list_header_left_margin">16dip</dimen>
     <dimen name="contact_browser_list_header_right_margin">@dimen/list_visible_scrollbar_padding</dimen>
     <dimen name="contact_browser_list_item_text_indent">8dip</dimen>
     <dimen name="contact_browser_list_header_height">48dp</dimen>
     <dimen name="contact_browser_list_header_icon_size">24dp</dimen>
-    <dimen name="contact_browser_list_header_text_margin">20dp</dimen>
+    <dimen name="contact_browser_list_header_text_margin">24dp</dimen>
     <!-- Width of a contact list item section header. -->
     <dimen name="contact_list_section_header_width">48dp</dimen>