diff --git a/res/layout/action_bar_spinner.xml b/res/layout/action_bar_spinner.xml
index 9d5f9d30e..11c2fa801 100644
--- a/res/layout/action_bar_spinner.xml
+++ b/res/layout/action_bar_spinner.xml
@@ -47,7 +47,7 @@
     </RelativeLayout>
     <TextView
         android:id="@+id/spinner_count"
-        style="@style/unread_count"
+        style="@style/unreadCount"
         android:includeFontPadding="false"
         android:textStyle="normal"
         />
diff --git a/res/layout/action_bar_spinner_dropdown.xml b/res/layout/action_bar_spinner_dropdown.xml
index 15f3f6c58..dc588f500 100644
--- a/res/layout/action_bar_spinner_dropdown.xml
+++ b/res/layout/action_bar_spinner_dropdown.xml
@@ -27,7 +27,7 @@
         android:id="@+id/unread_count"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        style="@style/unread_count"
+        style="@style/unreadCount"
         />
     <LinearLayout
         android:layout_height="wrap_content"
diff --git a/res/layout/mailbox_list_header.xml b/res/layout/mailbox_list_header.xml
index 99d424e16..4bef0c5e6 100644
--- a/res/layout/mailbox_list_header.xml
+++ b/res/layout/mailbox_list_header.xml
@@ -18,4 +18,5 @@
     android:id="@+id/display_name"
     android:layout_width="match_parent"
     android:ellipsize="end"
-    style="?android:attr/listSeparatorTextViewStyle" />
+    style="?android:attr/listSeparatorTextViewStyle"
+    android:layout_marginLeft="@dimen/mailbox_list_padding_left" />
diff --git a/res/layout/mailbox_list_item.xml b/res/layout/mailbox_list_item.xml
index 438c5631e..d1c45b6a4 100644
--- a/res/layout/mailbox_list_item.xml
+++ b/res/layout/mailbox_list_item.xml
@@ -27,15 +27,9 @@
     >
     <TextView
         android:id="@+id/message_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/mailbox_list_count_margin_left"
         android:layout_marginRight="@dimen/mailbox_list_padding_right"
-        android:singleLine="true"
-        android:textSize="14dip"
-        android:textColor="@color/text_color_primary_invertible"
+        style="@style/unreadCount"
         />
     <RelativeLayout
         android:layout_alignParentLeft="true"
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index b9f227de5..0f423b8a1 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -16,10 +16,6 @@
 
 <!-- non-xlarge, landscape -->
 <resources>
-    <dimen name="mailbox_list_padding_left">16dip</dimen>
-    <dimen name="mailbox_list_padding_right">24dip</dimen>
-    <dimen name="mailbox_list_count_margin_left">16dip</dimen>
-
     <dimen name="mailbox_list_width">160dip</dimen>
     <dimen name="message_list_width">160dip</dimen>
     <dimen name="action_bar_account_name_max_width">100dip</dimen>
diff --git a/res/values-port/dimensions.xml b/res/values-port/dimensions.xml
index e789ed102..279fbd790 100644
--- a/res/values-port/dimensions.xml
+++ b/res/values-port/dimensions.xml
@@ -16,10 +16,6 @@
 
 <!-- non-xlarge, portrait -->
 <resources>
-    <dimen name="mailbox_list_padding_left">16dip</dimen>
-    <dimen name="mailbox_list_padding_right">16dip</dimen>
-    <dimen name="mailbox_list_count_margin_left">8dip</dimen>
-
     <dimen name="mailbox_list_width">100dip</dimen>
     <dimen name="message_list_width">100dip</dimen>
     <dimen name="action_bar_account_name_max_width">100dip</dimen>
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index 093318d3c..a59af4323 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -53,4 +53,9 @@
     <dimen name="setup_item_inset_left">16dip</dimen>
     <dimen name="setup_item_inset_right">64dip</dimen>
 
+    <!-- Folder list items -->
+    <dimen name="mailbox_list_padding_left">16dip</dimen>
+    <dimen name="mailbox_list_padding_right">24dip</dimen>
+    <dimen name="mailbox_list_count_margin_left">16dip</dimen>
+
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 1b6ae4d6d..7c399edc7 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -68,4 +68,9 @@
 
     <!-- Username/password entry -->
     <dimen name="setup_credentials_input_width">340dip</dimen>
+
+    <!-- Folder list item -->
+    <dimen name="mailbox_list_padding_left">8dip</dimen>
+    <dimen name="mailbox_list_padding_right">16dip</dimen>
+    <dimen name="mailbox_list_count_margin_left">8dip</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6e3c51ee0..c88ff5976 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,20 +19,6 @@
     <style name="EmailTheme" parent="@android:style/Theme.Holo.Light">
     </style>
 
-    <style name="unreadCount">
-        <item name="android:ellipsize">end</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">#FF000000</item>
-        <item name="android:paddingLeft">3dip</item>
-        <item name="android:paddingRight">3dip</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingBottom">1dip</item>
-        <item name="android:minWidth">20dip</item>
-        <item name="android:maxWidth">48dip</item>
-        <item name="android:gravity">center_horizontal|center_vertical</item>
-    </style>
-
     <style name="ThemeNoTitleBar" parent="android:Theme.NoTitleBar">
         <item name="android:windowContentOverlay">@null</item>
     </style>
@@ -107,18 +93,6 @@
         <item name="android:ellipsize">end</item>
     </style>
 
-    <style name="unread_count">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:layout_marginRight">16dip</item>
-        <item name="android:layout_marginLeft">4dip</item>
-        <item name="android:textColor">@color/text_ternary_color</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
-        <item name="android:singleLine">true</item>
-    </style>
-
     <style name="Attachment" />
 
     <style name="Attachment.Button" parent="@android:style/Widget.Holo.Button.Borderless">