diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index b57181510..ddbd54b4b 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -33,10 +33,10 @@
 
         <ImageButton
             android:id="@+id/folders"
-            android:layout_alignParentTop="true" 
-            android:layout_gravity="top"
+            android:gravity="center_vertical"
             android:focusable="false"
-            android:background="@drawable/ic_show_folders"
+            android:layout_marginRight="3dip"
+            android:background="?attr/iconFolder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             />
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index c9ef5a600..e41e0e862 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -129,19 +129,51 @@
                 <!-- Date/Time + Icons -->
                 <LinearLayout
                     android:id="@+id/topright_container"
-                    android:layout_marginTop="2dip"
+                    android:layout_marginTop="6dip"
                     android:layout_marginRight="6dip"
                     android:orientation="vertical"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="6dp"
-                    android:gravity="right">
+                    android:layout_gravity="right">
+                    <LinearLayout
+                        android:id="@+id/date_time_container"
+                        android:orientation="vertical"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="6dip"
+                        android:paddingRight="5dip"
+                            android:gravity="right"
+                        >
+
+                        <TextView
+                            android:id="@+id/date"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:singleLine="true"
+                            android:ellipsize="none"
+                            android:textSize="10sp"
+                            android:textColor="?android:attr/textColorPrimary"
+                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+                        <TextView
+                            android:id="@+id/time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="10sp"
+                            android:singleLine="true"
+                            android:ellipsize="none"
+                            android:textColor="?android:attr/textColorPrimary"
+                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+                    </LinearLayout>
+
 
                     <LinearLayout
                         android:id="@+id/icons_container"
                         android:orientation="horizontal"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
+                        android:layout_gravity="center_vertical|right">
 
                         <View
                             android:id="@+id/answered"
@@ -160,37 +192,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:focusable="false"
-                            style="?android:attr/starStyle"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/date_time_container"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="right">
-
-                        <TextView
-                            android:id="@+id/date"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:singleLine="true"
-                            android:ellipsize="none"
-                            android:textSize="10sp"
-                            android:paddingRight="3dip"
-                            android:textColor="?android:attr/textColorPrimary"
-                            android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-                        <TextView
-                            android:id="@+id/time"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textSize="10sp"
-                            android:singleLine="true"
-                            android:ellipsize="none"
-                            android:textColor="?android:attr/textColorPrimary"
-                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+                            android:button="@drawable/star"
+                            />
 
                     </LinearLayout>