diff --git a/res/drawable-hdpi/bg_arrow_focus.9.png b/res/drawable-hdpi/bg_arrow_focus.9.png
new file mode 100644
index 000000000..60f777b3b
Binary files /dev/null and b/res/drawable-hdpi/bg_arrow_focus.9.png differ
diff --git a/res/drawable-hdpi/bg_arrow_press.9.png b/res/drawable-hdpi/bg_arrow_press.9.png
new file mode 100644
index 000000000..154ab9f6d
Binary files /dev/null and b/res/drawable-hdpi/bg_arrow_press.9.png differ
diff --git a/res/drawable-hdpi/bg_arrow_unselected.9.png b/res/drawable-hdpi/bg_arrow_unselected.9.png
new file mode 100644
index 000000000..18517f684
Binary files /dev/null and b/res/drawable-hdpi/bg_arrow_unselected.9.png differ
diff --git a/res/drawable-hdpi/btn_icon_bg_focused.9.png b/res/drawable-hdpi/btn_icon_bg_focused.9.png
deleted file mode 100644
index e3a80e844..000000000
Binary files a/res/drawable-hdpi/btn_icon_bg_focused.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_icon_bg_pressed.9.png b/res/drawable-hdpi/btn_icon_bg_pressed.9.png
deleted file mode 100644
index 63ce6ac48..000000000
Binary files a/res/drawable-hdpi/btn_icon_bg_pressed.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/divider_vertical_light_opaque.9.png b/res/drawable-hdpi/divider_vertical_light_opaque.9.png
new file mode 100755
index 000000000..8f35315ae
Binary files /dev/null and b/res/drawable-hdpi/divider_vertical_light_opaque.9.png differ
diff --git a/res/drawable-hdpi/header_card.9.png b/res/drawable-hdpi/header_card.9.png
new file mode 100644
index 000000000..020b89f61
Binary files /dev/null and b/res/drawable-hdpi/header_card.9.png differ
diff --git a/res/drawable-hdpi/ic_email_thread_open_top_default.9.png b/res/drawable-hdpi/ic_email_thread_open_top_default.9.png
deleted file mode 100644
index 65bcc0435..000000000
Binary files a/res/drawable-hdpi/ic_email_thread_open_top_default.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/bg_arrow_focus.9.png b/res/drawable-mdpi/bg_arrow_focus.9.png
new file mode 100644
index 000000000..5e209fc9c
Binary files /dev/null and b/res/drawable-mdpi/bg_arrow_focus.9.png differ
diff --git a/res/drawable-mdpi/bg_arrow_press.9.png b/res/drawable-mdpi/bg_arrow_press.9.png
new file mode 100644
index 000000000..186657200
Binary files /dev/null and b/res/drawable-mdpi/bg_arrow_press.9.png differ
diff --git a/res/drawable-mdpi/bg_arrow_unselected.9.png b/res/drawable-mdpi/bg_arrow_unselected.9.png
new file mode 100644
index 000000000..c5fc8c57c
Binary files /dev/null and b/res/drawable-mdpi/bg_arrow_unselected.9.png differ
diff --git a/res/drawable-mdpi/btn_icon_bg_focused.9.png b/res/drawable-mdpi/btn_icon_bg_focused.9.png
deleted file mode 100755
index 81857f4d1..000000000
Binary files a/res/drawable-mdpi/btn_icon_bg_focused.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_icon_bg_pressed.9.png b/res/drawable-mdpi/btn_icon_bg_pressed.9.png
deleted file mode 100755
index 9201624d2..000000000
Binary files a/res/drawable-mdpi/btn_icon_bg_pressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/divider_vertical_light_opaque.9.png b/res/drawable-mdpi/divider_vertical_light_opaque.9.png
new file mode 100755
index 000000000..8f35315ae
Binary files /dev/null and b/res/drawable-mdpi/divider_vertical_light_opaque.9.png differ
diff --git a/res/drawable-mdpi/header_card.9.png b/res/drawable-mdpi/header_card.9.png
new file mode 100644
index 000000000..9c6540f79
Binary files /dev/null and b/res/drawable-mdpi/header_card.9.png differ
diff --git a/res/drawable-mdpi/ic_email_thread_open_top_default.9.png b/res/drawable-mdpi/ic_email_thread_open_top_default.9.png
deleted file mode 100644
index 9aebde9d7..000000000
Binary files a/res/drawable-mdpi/ic_email_thread_open_top_default.9.png and /dev/null differ
diff --git a/res/drawable/btn_arrow_background.xml b/res/drawable/btn_arrow_background.xml
index b30941a91..e0ebc6a7f 100644
--- a/res/drawable/btn_arrow_background.xml
+++ b/res/drawable/btn_arrow_background.xml
@@ -19,7 +19,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_icon_bg_pressed" />
-    <item android:state_focused="true" android:drawable="@drawable/btn_icon_bg_focused" />
-    <!-- <item android:drawable="@drawable/bg_arrow_unselected" /> -->
+    <item android:state_pressed="true" android:drawable="@drawable/bg_arrow_press" />
+    <item android:state_focused="true" android:drawable="@drawable/bg_arrow_focus" />
+    <item android:state_focused="false" android:state_pressed="false"
+          android:drawable="@drawable/bg_arrow_unselected" />
 </selector>
diff --git a/res/drawable/btn_arrow_left.xml b/res/drawable/btn_arrow_left.xml
index 339e56f9a..149528437 100644
--- a/res/drawable/btn_arrow_left.xml
+++ b/res/drawable/btn_arrow_left.xml
@@ -19,6 +19,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/ic_btn_arrow_left_focus" />
-    <item android:drawable="@drawable/ic_btn_arrow_left_unselected" />
+    <item android:state_focused="false" android:state_pressed="false"
+          android:drawable="@drawable/ic_btn_arrow_left_unselected" />
+    <item android:drawable="@drawable/ic_btn_arrow_left_focus" />
 </selector>
diff --git a/res/drawable/btn_arrow_right.xml b/res/drawable/btn_arrow_right.xml
index 077cba690..aa40faba8 100644
--- a/res/drawable/btn_arrow_right.xml
+++ b/res/drawable/btn_arrow_right.xml
@@ -19,6 +19,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/ic_btn_arrow_right_focus" />
-    <item android:drawable="@drawable/ic_btn_arrow_right_unselected" />
+    <item android:state_focused="false" android:state_pressed="false"
+          android:drawable="@drawable/ic_btn_arrow_right_unselected" />
+    <item android:drawable="@drawable/ic_btn_arrow_right_focus" />
 </selector>
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 65f7504cb..ce623229b 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -33,29 +33,40 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
             <!-- Note, height is 2+35+0.  There is a 4pixel fade on top of header image -->
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="37dip"
                 android:paddingTop="2dip"
-                android:paddingLeft="6dip"
-                android:paddingRight="9dip">
+                android:background="#101010">
                 <ImageButton
                     android:id="@+id/previous"
                     android:layout_height="35dip"
-                    android:layout_width="40dip"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentTop="true"
                     android:src="@drawable/btn_arrow_left"
-                    android:background="@drawable/btn_arrow_background" />
+                    android:scaleType="fitStart" 
+                    android:paddingLeft="6dip"
+                    android:background="@drawable/btn_arrow_background"
+                    android:paddingTop="0dip"
+                    android:paddingBottom="0dip"
+                     />
                 <ImageButton
                     android:id="@+id/next"
                     android:layout_height="35dip"
-                    android:layout_width="40dip"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentTop="true" 
                     android:src="@drawable/btn_arrow_right"
-                    android:background="@drawable/btn_arrow_background" />
-            </RelativeLayout>
+                    android:scaleType="fitEnd"
+                    android:paddingRight="9dip"
+                    android:background="@drawable/btn_arrow_background"
+                    android:paddingTop="0dip"
+                    android:paddingBottom="0dip" 
+                     />
+            </LinearLayout>
 
             <include layout="@layout/message_view_header" />
 
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 5d50ba3f2..8b0c935ee 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -20,7 +20,11 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/ic_email_thread_open_top_default">
+        android:background="@drawable/header_card"
+        android:paddingTop="3dip"
+        android:paddingBottom="3dip"
+        android:paddingLeft="3dip"
+        android:paddingRight="6dip">
         <LinearLayout
             android:id="@+id/from_container"
             android:layout_width="fill_parent"
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 0000443b2..57b126982 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -816,8 +816,8 @@ public class MessageView extends Activity implements OnClickListener {
                 hasPrev = !cursor.isFirst();
                 hasNext = !cursor.isLast();
             }
-            mPrevious.setVisibility(hasPrev ? View.VISIBLE : View.GONE);
-            mNext.setVisibility(hasNext ? View.VISIBLE : View.GONE);
+            mPrevious.setVisibility(hasPrev ? View.VISIBLE : View.INVISIBLE);
+            mNext.setVisibility(hasNext ? View.VISIBLE : View.INVISIBLE);
         }
     }