diff --git a/res/layout/group_account_header_vertical.xml b/res/layout/group_account_header_vertical.xml
index 8edbb8b..35b47fd 100644
--- a/res/layout/group_account_header_vertical.xml
+++ b/res/layout/group_account_header_vertical.xml
@@ -17,19 +17,17 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?attr/list_item_header_height"
+    android:layout_height="?attr/list_item_header_height"
     android:layout_marginLeft="?attr/list_item_padding_left"
     android:layout_marginRight="?attr/list_item_padding_right"
-    android:paddingBottom="4dip"
     android:background="@drawable/list_section_divider_holo_custom"
+    android:gravity="center_vertical"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/account_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
         android:paddingLeft="?attr/list_item_header_text_indent"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@color/people_app_theme_color"
@@ -43,7 +41,6 @@
         android:id="@+id/account_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
         android:paddingLeft="?attr/list_item_header_text_indent"
         android:textColor="@color/contact_count_text_color"
         android:textSize="12sp"
diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml
index 67b64d5..29fd1c6 100644
--- a/res/layout/user_profile_header.xml
+++ b/res/layout/user_profile_header.xml
@@ -19,12 +19,11 @@
     android:id="@+id/user_profile_header"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/list_header_extra_top_padding"
+    android:layout_height="?attr/list_item_header_height"
     android:paddingLeft="?attr/list_item_padding_left"
-    android:paddingRight="?attr/list_item_padding_right" 
+    android:paddingRight="?attr/list_item_padding_right"
     android:background="@drawable/list_section_divider_holo_custom"
-    android:minHeight="?attr/list_item_header_height"
+    android:gravity="center_vertical"
     >
 
     <TextView
@@ -35,8 +34,6 @@
         android:text="@string/user_profile_contacts_list_header"
         android:textStyle="bold"
         android:ellipsize="end"
-        android:layout_gravity="left|bottom"
-        android:layout_marginBottom="2dip"
         android:layout_weight="1"
         android:textAllCaps="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -49,8 +46,6 @@
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:ellipsize="end"
-        android:layout_gravity="right|bottom"
-        android:layout_marginBottom="2dip"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="12sp"
         android:textColor="@color/contact_count_text_color" />