diff --git a/res/drawable/envelope.png b/res/drawable/envelope.png
new file mode 100644
index 000000000..d3846347f
Binary files /dev/null and b/res/drawable/envelope.png differ
diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index b6457a5ad..bfb6b36ec 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -40,9 +40,9 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:orientation="vertical"
-        android:paddingLeft="6dip"
-        android:paddingTop="6dip"
+        android:paddingTop="2dip"
         android:paddingBottom="0dip"
+        android:paddingLeft="6dip"
         android:paddingRight="6dip"
         android:gravity="right"
         >
@@ -51,10 +51,13 @@
 	        android:ellipsize="end"
 	        android:singleLine="true"
 	        android:textAppearance="?android:attr/textAppearanceMedium"
-	        android:textColor="?android:attr/textColorPrimary"
+	        android:textColor="#ffffff"
+	        android:textStyle="bold"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:background="@drawable/text_box"
+	        android:background="@drawable/envelope"
+            android:paddingTop="4dip"
+            android:paddingBottom="4dip"
 	        android:paddingLeft="10dip"
 	        android:paddingRight="10dip"
 	        android:gravity="right"
@@ -70,10 +73,10 @@
 	        android:background="@drawable/btn_star_big_buttonless_on"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-            android:paddingRight="10dip"
             android:paddingTop="6dip"
-            android:paddingLeft="10dip"
             android:paddingBottom="4dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
             android:gravity="right"
 	        android:layout_gravity="bottom"
 	        android:layout_alignParentBottom="true" 
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 35734ee02..3d747ac57 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -43,9 +43,9 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:orientation="vertical"
-        android:paddingLeft="6dip"
-        android:paddingTop="6dip"
+        android:paddingTop="2dip"
         android:paddingBottom="0dip"
+        android:paddingLeft="6dip"
         android:paddingRight="6dip"
         android:gravity="right"
         >
@@ -54,11 +54,14 @@
 	        android:ellipsize="end"
 	        android:singleLine="true"
 	        android:textAppearance="?android:attr/textAppearanceMedium"
-	        android:textColor="?android:attr/textColorPrimary"
+	        android:textColor="#ffffff"
+            android:textStyle="bold"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:background="@drawable/text_box"
-	        android:paddingLeft="10dip"
+	        android:background="@drawable/envelope"
+            android:paddingTop="4dip"
+            android:paddingBottom="4dip"
+            android:paddingLeft="10dip"
             android:paddingRight="10dip"
             android:gravity="right"
             android:layout_gravity="top" 
@@ -72,10 +75,10 @@
            android:background="@drawable/btn_star_big_buttonless_on"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           android:paddingRight="10dip"
-            android:paddingTop="6dip"
-            android:paddingLeft="10dip"
+           android:paddingTop="6dip"
             android:paddingBottom="4dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
             android:gravity="right"
             android:layout_gravity="bottom"
             android:layout_alignParentBottom="true"