diff --git a/res/drawable-hdpi/ic_menu_compose_holo_light.png b/res/drawable-hdpi/ic_menu_compose_holo_light.png
index 10fc6dd0c..95c2d651b 100644
Binary files a/res/drawable-hdpi/ic_menu_compose_holo_light.png and b/res/drawable-hdpi/ic_menu_compose_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_refresh_holo_light.png b/res/drawable-hdpi/ic_menu_refresh_holo_light.png
index 95c2d651b..10fc6dd0c 100644
Binary files a/res/drawable-hdpi/ic_menu_refresh_holo_light.png and b/res/drawable-hdpi/ic_menu_refresh_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_send_holo_light.png b/res/drawable-hdpi/ic_menu_send_holo_light.png
index b30694bd1..9e8c7bc8a 100644
Binary files a/res/drawable-hdpi/ic_menu_send_holo_light.png and b/res/drawable-hdpi/ic_menu_send_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_compose_holo_light.png b/res/drawable-mdpi/ic_menu_compose_holo_light.png
index f0d0df444..334cb9198 100644
Binary files a/res/drawable-mdpi/ic_menu_compose_holo_light.png and b/res/drawable-mdpi/ic_menu_compose_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_refresh_holo_light.png b/res/drawable-mdpi/ic_menu_refresh_holo_light.png
index 334cb9198..f0d0df444 100644
Binary files a/res/drawable-mdpi/ic_menu_refresh_holo_light.png and b/res/drawable-mdpi/ic_menu_refresh_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_send_holo_light.png b/res/drawable-mdpi/ic_menu_send_holo_light.png
index 761bd2fa5..b1b7b12a8 100644
Binary files a/res/drawable-mdpi/ic_menu_send_holo_light.png and b/res/drawable-mdpi/ic_menu_send_holo_light.png differ
diff --git a/res/layout-xlarge/message_compose.xml b/res/layout-xlarge/message_compose.xml
index 57100ff7b..8741f3a6c 100644
--- a/res/layout-xlarge/message_compose.xml
+++ b/res/layout-xlarge/message_compose.xml
@@ -132,11 +132,12 @@
                 android:layout_width="wrap_content"
                 android:text="@string/add_cc_bcc_action"
                 />
-            <Button
+            <ImageButton
                 android:id="@+id/add_attachment"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:text="@string/add_attachment_action"
+                android:src="@drawable/ic_add_attachment_holo_light"
                 />
 
             <!--
diff --git a/res/layout-xlarge/message_view_fragment.xml b/res/layout-xlarge/message_view_fragment.xml
index db593a48a..c9d72858a 100644
--- a/res/layout-xlarge/message_view_fragment.xml
+++ b/res/layout-xlarge/message_view_fragment.xml
@@ -108,7 +108,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginRight="16dip"
                     android:layout_marginLeft="16dip"
-                    android:src="@drawable/reply"
+                    android:src="@drawable/ic_reply"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
                     />
@@ -118,7 +118,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginRight="16dip"
                     android:layout_marginLeft="16dip"
-                    android:src="@drawable/reply_all"
+                    android:src="@drawable/ic_reply_all"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
                     />
@@ -128,7 +128,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginRight="16dip"
                     android:layout_marginLeft="16dip"
-                    android:src="@drawable/forward"
+                    android:src="@drawable/ic_forward"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
                     />
@@ -138,7 +138,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginRight="16dip"
                     android:layout_marginLeft="16dip"
-                    android:src="@drawable/btn_star_big_buttonless_off"
+                    android:src="@drawable/ic_star_none_holo_light"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
                     />
diff --git a/res/layout/message_compose_attachment.xml b/res/layout/message_compose_attachment.xml
index f22e7566f..86d111487 100644
--- a/res/layout/message_compose_attachment.xml
+++ b/res/layout/message_compose_attachment.xml
@@ -23,7 +23,7 @@
 	android:paddingBottom="6dip">
 	<ImageButton
 		android:id="@+id/attachment_delete"
-		android:src="@android:drawable/ic_delete"
+		android:src="@drawable/ic_remove_attachment_holo_light"
 		android:layout_alignParentRight="true"
 		android:layout_height="42dip"
 		android:layout_width="42dip" />
@@ -45,7 +45,7 @@
 	<ImageView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:src="@drawable/ic_email_attachment"
+		android:src="@drawable/ic_attachment_holo_light"
 		android:layout_marginLeft="1dip"
 		android:layout_centerVertical="true" />
 </RelativeLayout>
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index e9154e29e..515f2a511 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -125,6 +125,6 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_alignParentLeft="true"
-            android:src="@drawable/ic_email_attachment" />
+            android:src="@drawable/ic_attachment_holo_light" />
     </LinearLayout>
 </FrameLayout>
diff --git a/res/layout/widget_list_item.xml b/res/layout/widget_list_item.xml
index 3ae64b1a2..090a8ad62 100644
--- a/res/layout/widget_list_item.xml
+++ b/res/layout/widget_list_item.xml
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="-10sp"
             android:layout_marginRight="-4dip"
-            android:src="@drawable/ic_attachment_holo_light" />
+            android:src="@drawable/ic_badge_attachment" />
         <TextView
             android:id="@+id/widget_date"
             android:layout_width="wrap_content"
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index f602c0e41..a29917f88 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -19,7 +19,8 @@
     <item
         android:id="@+id/send"
         android:title="@string/send_action"
-        android:showAsAction="always"
+        android:showAsAction="always|withText"
+        android:icon="@drawable/ic_menu_send_holo_light"
         android:alphabeticShortcut="s"
     />
     <item
@@ -33,6 +34,7 @@
         android:id="@+id/discard"
         android:title="@string/discard_action"
         android:showAsAction="always"
+        android:icon="@drawable/ic_menu_trash_holo_light"
         android:alphabeticShortcut="q"
     />
 </menu>
diff --git a/res/menu/message_list_fragment_option.xml b/res/menu/message_list_fragment_option.xml
index 830f076ab..bef60848a 100644
--- a/res/menu/message_list_fragment_option.xml
+++ b/res/menu/message_list_fragment_option.xml
@@ -20,6 +20,7 @@
         android:id="@+id/send"
         android:orderInCategory="50"
         android:title="@string/message_list_send_pending_messages_action"
-        android:showAsAction="ifRoom"
+        android:showAsAction="ifRoom|withText"
+        android:icon="@drawable/ic_menu_send_holo_light"
     />
 </menu>
diff --git a/res/menu/message_list_selection_mode.xml b/res/menu/message_list_selection_mode.xml
index d1da8435f..2f1a9edd9 100644
--- a/res/menu/message_list_selection_mode.xml
+++ b/res/menu/message_list_selection_mode.xml
@@ -16,15 +16,21 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/move" android:title="@string/move_action"
+        android:icon="@drawable/ic_menu_move_to_holo_light"
         android:showAsAction="always" />
     <item android:id="@+id/mark_read" android:title="@string/read_action"
+        android:icon="@drawable/ic_menu_mark"
         android:showAsAction="always" />
     <item android:id="@+id/mark_unread" android:title="@string/unread_action"
+        android:icon="@drawable/ic_menu_mark"
         android:showAsAction="always" />
     <item android:id="@+id/add_star" android:title="@string/set_star_action"
+        android:icon="@drawable/ic_menu_add_star_holo_light"
         android:showAsAction="always" />
     <item android:id="@+id/remove_star" android:title="@string/remove_star_action"
+        android:icon="@drawable/ic_menu_add_star_holo_light"
         android:showAsAction="always" />
     <item android:id="@+id/delete" android:title="@string/delete_action"
+        android:icon="@drawable/ic_menu_trash_holo_light"
         android:showAsAction="always" />
 </menu>
diff --git a/res/menu/message_list_xl_option.xml b/res/menu/message_list_xl_option.xml
index 35e8c5a51..339b5abe1 100644
--- a/res/menu/message_list_xl_option.xml
+++ b/res/menu/message_list_xl_option.xml
@@ -20,7 +20,7 @@
         android:orderInCategory="100"
         android:alphabeticShortcut="c"
         android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose"
+        android:icon="@drawable/ic_menu_compose_holo_light"
         android:showAsAction="ifRoom"
     />
     <item
@@ -28,7 +28,7 @@
         android:orderInCategory="200"
         android:alphabeticShortcut="r"
         android:title="@string/refresh_action"
-        android:icon="@drawable/ic_menu_refresh"
+        android:icon="@drawable/ic_menu_refresh_holo_light"
         android:showAsAction="ifRoom"
     />
     <item
diff --git a/res/menu/message_view_fragment_option.xml b/res/menu/message_view_fragment_option.xml
index d257b1ce5..9bc873be4 100644
--- a/res/menu/message_view_fragment_option.xml
+++ b/res/menu/message_view_fragment_option.xml
@@ -20,12 +20,14 @@
         android:id="@+id/move"
         android:orderInCategory="1000"
         android:title="@string/move_action"
+        android:icon="@drawable/ic_menu_move_to_holo_light"
         android:showAsAction="ifRoom"
     />
     <item
         android:id="@+id/delete"
         android:orderInCategory="1100"
         android:title="@string/delete_action"
+        android:icon="@drawable/ic_menu_trash_holo_light"
         android:showAsAction="ifRoom"
     />
     <item
@@ -33,5 +35,6 @@
         android:orderInCategory="1200"
         android:title="@string/mark_as_unread_action"
         android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_mark"
     />
 </menu>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c675b048e..6dd555f92 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -161,19 +161,19 @@
          of the types of mailboxes defined in EmailContent -->
     <array name="mailbox_display_icons" translatable="false">
         <!-- TYPE_INBOX = 0 -->
-        <item>@drawable/ic_list_inbox</item>
+        <item>@drawable/ic_folder_inbox_holo_light</item>
         <!-- TYPE_MAIL = 1 -->
         <item></item>
         <!-- TYPE_PARENT = 2 -->
         <item></item>
         <!-- TYPE_DRAFTS = 3 -->
-        <item>@drawable/ic_list_drafts</item>
+        <item>@drawable/ic_folder_drafts_holo_light</item>
         <!-- TYPE_OUTBOX = 4 -->
-        <item>@drawable/ic_list_outbox</item>
+        <item>@drawable/ic_folder_outbox_holo_light</item>
         <!-- TYPE_SENT = 5 -->
-        <item>@drawable/ic_list_sent</item>
+        <item>@drawable/ic_folder_sent_holo_light</item>
         <!-- TYPE_TRASH = 6 -->
-        <item>@drawable/ic_list_trash</item>
+        <item>@drawable/ic_folder_trash_holo_light</item>
         <!-- TYPE_JUNK = 7 -->
         <item>@drawable/ic_list_spam</item>
     </array>
diff --git a/src/com/android/email/Utility.java b/src/com/android/email/Utility.java
index 620dece59..0471d672a 100644
--- a/src/com/android/email/Utility.java
+++ b/src/com/android/email/Utility.java
@@ -383,7 +383,7 @@ public class Utility {
             mSpecialMailboxDrawable =
                 context.getResources().obtainTypedArray(R.array.mailbox_display_icons);
             mSummaryStarredMailboxDrawable =
-                context.getResources().getDrawable(R.drawable.ic_list_starred);
+                context.getResources().getDrawable(R.drawable.ic_folder_star_holo_light);
             mSummaryCombinedInboxDrawable =
                 context.getResources().getDrawable(R.drawable.ic_list_combined_inbox);
         }
diff --git a/src/com/android/email/activity/MessageListItem.java b/src/com/android/email/activity/MessageListItem.java
index cfa659b88..a7a55ba81 100644
--- a/src/com/android/email/activity/MessageListItem.java
+++ b/src/com/android/email/activity/MessageListItem.java
@@ -202,10 +202,10 @@ public class MessageListItem extends View {
             sBoldPaint.setTypeface(Typeface.DEFAULT_BOLD);
             sBoldPaint.setTextSize(sTextSize);
             sBoldPaint.setAntiAlias(true);
-            sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_mms_attachment_small);
-            sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_calendar_event_small);
+            sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_attachment);
+            sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_invite);
             sFavoriteIconOff =
-                BitmapFactory.decodeResource(r, R.drawable.btn_star_big_buttonless_dark_off);
+                BitmapFactory.decodeResource(r, R.drawable.ic_star_none_holo_light);
             sFavoriteIconOn =
                 BitmapFactory.decodeResource(r, R.drawable.btn_star_big_buttonless_dark_on);
             sSelectedIconOff =
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 7584cefb6..99ba4edb7 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -150,7 +150,7 @@ public class MessageViewFragment extends MessageViewFragmentBase {
 
         final Resources res = getActivity().getResources();
         mFavoriteIconOn = res.getDrawable(R.drawable.btn_star_big_buttonless_on);
-        mFavoriteIconOff = res.getDrawable(R.drawable.btn_star_big_buttonless_off);
+        mFavoriteIconOff = res.getDrawable(R.drawable.ic_star_none_holo_light);
     }
 
     @Override
diff --git a/tests/src/com/android/email/provider/AttachmentProviderTests.java b/tests/src/com/android/email/provider/AttachmentProviderTests.java
index f420b791e..2860f7205 100644
--- a/tests/src/com/android/email/provider/AttachmentProviderTests.java
+++ b/tests/src/com/android/email/provider/AttachmentProviderTests.java
@@ -665,7 +665,7 @@ public class AttachmentProviderTests extends ProviderTestCase2<AttachmentProvide
     private String createAttachmentFile(Account forAccount, long id) throws IOException {
         File outFile = getAttachmentFile(forAccount, id);
         Bitmap bitmap = BitmapFactory.decodeResource(getContext().getResources(),
-                R.drawable.ic_email_attachment);
+                R.drawable.ic_attachment_holo_light);
         FileOutputStream out = new FileOutputStream(outFile);
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
         out.close();