diff --git a/res/drawable-hdpi/attached_image_placeholder.png b/res/drawable-hdpi/attached_image_placeholder.png
deleted file mode 100644
index bbbd306c1..000000000
Binary files a/res/drawable-hdpi/attached_image_placeholder.png and /dev/null differ
diff --git a/res/drawable-hdpi/attachment_bg_holo.9.png b/res/drawable-hdpi/attachment_bg_holo.9.png
new file mode 100644
index 000000000..43983c5fe
Binary files /dev/null and b/res/drawable-hdpi/attachment_bg_holo.9.png differ
diff --git a/res/drawable-hdpi/banner_background_search.9.png b/res/drawable-hdpi/banner_background_search.9.png
new file mode 100644
index 000000000..0e2c2bedd
Binary files /dev/null and b/res/drawable-hdpi/banner_background_search.9.png differ
diff --git a/res/drawable-hdpi/bg_dragdrop.9.png b/res/drawable-hdpi/bg_dragdrop.9.png
deleted file mode 100644
index b711a64cd..000000000
Binary files a/res/drawable-hdpi/bg_dragdrop.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/bg_row_email_widget_holo.9.png b/res/drawable-hdpi/bg_row_email_widget_holo.9.png
deleted file mode 100644
index 3d6bb1e6c..000000000
Binary files a/res/drawable-hdpi/bg_row_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/bg_row_read_email_widget_holo.9.png b/res/drawable-hdpi/bg_row_read_email_widget_holo.9.png
deleted file mode 100644
index dee9c1c6b..000000000
Binary files a/res/drawable-hdpi/bg_row_read_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-hdpi/btn_check_off_normal_holo_light.png
index dce5e73e5..351a4f088 100644
Binary files a/res/drawable-hdpi/btn_check_off_normal_holo_light.png and b/res/drawable-hdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-hdpi/btn_check_on_normal_holo_light.png
index 26726f6cb..4b4364c92 100644
Binary files a/res/drawable-hdpi/btn_check_on_normal_holo_light.png and b/res/drawable-hdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_ic_new_email_email_widget_holo_dark.png b/res/drawable-hdpi/btn_ic_new_email_email_widget_holo_dark.png
deleted file mode 100644
index 982af023f..000000000
Binary files a/res/drawable-hdpi/btn_ic_new_email_email_widget_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_maybe_focused.png b/res/drawable-hdpi/btn_maybe_focused.png
deleted file mode 100644
index 039a2b630..000000000
Binary files a/res/drawable-hdpi/btn_maybe_focused.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_maybe_off.png b/res/drawable-hdpi/btn_maybe_off.png
index 636ac7e70..f907a9dc1 100644
Binary files a/res/drawable-hdpi/btn_maybe_off.png and b/res/drawable-hdpi/btn_maybe_off.png differ
diff --git a/res/drawable-hdpi/btn_maybe_pressed.png b/res/drawable-hdpi/btn_maybe_pressed.png
deleted file mode 100644
index 7b5931fc7..000000000
Binary files a/res/drawable-hdpi/btn_maybe_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_no_focused.png b/res/drawable-hdpi/btn_no_focused.png
deleted file mode 100644
index ae61abe96..000000000
Binary files a/res/drawable-hdpi/btn_no_focused.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_no_off.png b/res/drawable-hdpi/btn_no_off.png
deleted file mode 100644
index dfaed7e3a..000000000
Binary files a/res/drawable-hdpi/btn_no_off.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_no_off.png.png b/res/drawable-hdpi/btn_no_off.png.png
new file mode 100644
index 000000000..f88b5a725
Binary files /dev/null and b/res/drawable-hdpi/btn_no_off.png.png differ
diff --git a/res/drawable-hdpi/btn_no_pressed.png b/res/drawable-hdpi/btn_no_pressed.png
deleted file mode 100644
index 9820ea3da..000000000
Binary files a/res/drawable-hdpi/btn_no_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_star_off_convo_holo_light.png b/res/drawable-hdpi/btn_star_off_convo_holo_light.png
new file mode 100644
index 000000000..8d0c6c29e
Binary files /dev/null and b/res/drawable-hdpi/btn_star_off_convo_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png
new file mode 100644
index 000000000..5076fbf0d
Binary files /dev/null and b/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_holo_light.png b/res/drawable-hdpi/btn_star_off_normal_holo_light.png
index 47598b4af..2eca31c02 100644
Binary files a/res/drawable-hdpi/btn_star_off_normal_holo_light.png and b/res/drawable-hdpi/btn_star_off_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_on_convo_holo_light.png b/res/drawable-hdpi/btn_star_on_convo_holo_light.png
new file mode 100644
index 000000000..718186ae3
Binary files /dev/null and b/res/drawable-hdpi/btn_star_on_convo_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png
new file mode 100644
index 000000000..3042cb75c
Binary files /dev/null and b/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_holo_light.png b/res/drawable-hdpi/btn_star_on_normal_holo_light.png
index 34d8ea194..99f317d23 100644
Binary files a/res/drawable-hdpi/btn_star_on_normal_holo_light.png and b/res/drawable-hdpi/btn_star_on_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_yes_focused.png b/res/drawable-hdpi/btn_yes_focused.png
deleted file mode 100644
index 01962cf34..000000000
Binary files a/res/drawable-hdpi/btn_yes_focused.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_yes_off.png b/res/drawable-hdpi/btn_yes_off.png
deleted file mode 100644
index 4d6ffc1ea..000000000
Binary files a/res/drawable-hdpi/btn_yes_off.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_yes_off.png.png b/res/drawable-hdpi/btn_yes_off.png.png
new file mode 100644
index 000000000..94e14806b
Binary files /dev/null and b/res/drawable-hdpi/btn_yes_off.png.png differ
diff --git a/res/drawable-hdpi/btn_yes_pressed.png b/res/drawable-hdpi/btn_yes_pressed.png
deleted file mode 100644
index 71f348816..000000000
Binary files a/res/drawable-hdpi/btn_yes_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/divider_horizontal_email.9.png b/res/drawable-hdpi/divider_horizontal_email.9.png
deleted file mode 100644
index 8358af9c3..000000000
Binary files a/res/drawable-hdpi/divider_horizontal_email.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/email_quoted_bar.9.png b/res/drawable-hdpi/email_quoted_bar.9.png
deleted file mode 100644
index ca993251b..000000000
Binary files a/res/drawable-hdpi/email_quoted_bar.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/expander_close_holo_light.9.png b/res/drawable-hdpi/expander_close_holo_light.9.png
new file mode 100644
index 000000000..2dd454837
Binary files /dev/null and b/res/drawable-hdpi/expander_close_holo_light.9.png differ
diff --git a/res/drawable-hdpi/expander_open_holo_light.9.png b/res/drawable-hdpi/expander_open_holo_light.9.png
new file mode 100644
index 000000000..7cec83ad5
Binary files /dev/null and b/res/drawable-hdpi/expander_open_holo_light.9.png differ
diff --git a/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png b/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png
index db5744fe5..0ed36dfa8 100644
Binary files a/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png and b/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png differ
diff --git a/res/drawable-hdpi/header_bg_email_widget_holo.9.png b/res/drawable-hdpi/header_bg_email_widget_holo.9.png
new file mode 100644
index 000000000..6216ba3c3
Binary files /dev/null and b/res/drawable-hdpi/header_bg_email_widget_holo.9.png differ
diff --git a/res/drawable-hdpi/header_bg_email_widget_holo.png b/res/drawable-hdpi/header_bg_email_widget_holo.png
deleted file mode 100644
index f8d7dd256..000000000
Binary files a/res/drawable-hdpi/header_bg_email_widget_holo.png and /dev/null differ
diff --git a/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png b/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png
new file mode 100644
index 000000000..bfc020e24
Binary files /dev/null and b/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png differ
diff --git a/res/drawable-hdpi/header_row_focused_email_widget_holo.9.png b/res/drawable-hdpi/header_row_focused_email_widget_holo.9.png
deleted file mode 100644
index b3406fd96..000000000
Binary files a/res/drawable-hdpi/header_row_focused_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/header_row_press_email_widget_holo.9.png b/res/drawable-hdpi/header_row_press_email_widget_holo.9.png
deleted file mode 100644
index 2a6ff60b9..000000000
Binary files a/res/drawable-hdpi/header_row_press_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_attachment_holo_light.png b/res/drawable-hdpi/ic_attachment_holo_light.png
index 0eb6b60f6..eae145e11 100644
Binary files a/res/drawable-hdpi/ic_attachment_holo_light.png and b/res/drawable-hdpi/ic_attachment_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_badge_attachment.png b/res/drawable-hdpi/ic_badge_attachment.png
index 891583e4c..a3db7ef5d 100644
Binary files a/res/drawable-hdpi/ic_badge_attachment.png and b/res/drawable-hdpi/ic_badge_attachment.png differ
diff --git a/res/drawable-hdpi/ic_badge_attachment_widget.png b/res/drawable-hdpi/ic_badge_attachment_widget.png
deleted file mode 100644
index 0b0199d67..000000000
Binary files a/res/drawable-hdpi/ic_badge_attachment_widget.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_badge_forward_holo_light.png b/res/drawable-hdpi/ic_badge_forward_holo_light.png
new file mode 100644
index 000000000..1b2d54fa5
Binary files /dev/null and b/res/drawable-hdpi/ic_badge_forward_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_badge_invite.png b/res/drawable-hdpi/ic_badge_invite.png
deleted file mode 100644
index 6e5a9cab5..000000000
Binary files a/res/drawable-hdpi/ic_badge_invite.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_badge_invite_holo_light.png b/res/drawable-hdpi/ic_badge_invite_holo_light.png
new file mode 100644
index 000000000..beb6c3024
Binary files /dev/null and b/res/drawable-hdpi/ic_badge_invite_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_badge_invite_widget.png b/res/drawable-hdpi/ic_badge_invite_widget.png
deleted file mode 100644
index 1856b0c5e..000000000
Binary files a/res/drawable-hdpi/ic_badge_invite_widget.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png b/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png
new file mode 100644
index 000000000..e89b30114
Binary files /dev/null and b/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_badge_reply_holo_light.png b/res/drawable-hdpi/ic_badge_reply_holo_light.png
new file mode 100644
index 000000000..1c0e82288
Binary files /dev/null and b/res/drawable-hdpi/ic_badge_reply_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_cancel_holo_light.png b/res/drawable-hdpi/ic_cancel_holo_light.png
deleted file mode 100644
index d8cacb44a..000000000
Binary files a/res/drawable-hdpi/ic_cancel_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_cc_holo_light.png b/res/drawable-hdpi/ic_cc_holo_light.png
new file mode 100644
index 000000000..00c132220
Binary files /dev/null and b/res/drawable-hdpi/ic_cc_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_edit_holo_dark.png b/res/drawable-hdpi/ic_edit_holo_dark.png
new file mode 100644
index 000000000..8fc5df16a
Binary files /dev/null and b/res/drawable-hdpi/ic_edit_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_email_email_widget_holo.png b/res/drawable-hdpi/ic_email_email_widget_holo.png
deleted file mode 100644
index eb992dc14..000000000
Binary files a/res/drawable-hdpi/ic_email_email_widget_holo.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_event_email.png b/res/drawable-hdpi/ic_event_email.png
deleted file mode 100644
index 8cb6b7f04..000000000
Binary files a/res/drawable-hdpi/ic_event_email.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_exchange_minitab_selected.png b/res/drawable-hdpi/ic_exchange_minitab_selected.png
index 39fd0f5fb..9337eac63 100644
Binary files a/res/drawable-hdpi/ic_exchange_minitab_selected.png and b/res/drawable-hdpi/ic_exchange_minitab_selected.png differ
diff --git a/res/drawable-hdpi/ic_exchange_selected.png b/res/drawable-hdpi/ic_exchange_selected.png
index 7f3b9b7bb..ef19e497f 100644
Binary files a/res/drawable-hdpi/ic_exchange_selected.png and b/res/drawable-hdpi/ic_exchange_selected.png differ
diff --git a/res/drawable-hdpi/ic_folder_star_holo_light.png b/res/drawable-hdpi/ic_folder_star_holo_light.png
deleted file mode 100644
index 9cdfef881..000000000
Binary files a/res/drawable-hdpi/ic_folder_star_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_folder_trash_holo_light.png b/res/drawable-hdpi/ic_folder_trash_holo_light.png
deleted file mode 100644
index 3dc8ac05d..000000000
Binary files a/res/drawable-hdpi/ic_folder_trash_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_gmail_draft.png b/res/drawable-hdpi/ic_gmail_draft.png
new file mode 100644
index 000000000..68aac0090
Binary files /dev/null and b/res/drawable-hdpi/ic_gmail_draft.png differ
diff --git a/res/drawable-hdpi/ic_list_spam.png b/res/drawable-hdpi/ic_list_spam.png
deleted file mode 100644
index 5769e80a9..000000000
Binary files a/res/drawable-hdpi/ic_list_spam.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
index 6d2be6aee..3d2c2ca06 100644
Binary files a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png and b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_accounts_holo_light.png b/res/drawable-hdpi/ic_menu_accounts_holo_light.png
new file mode 100644
index 000000000..eb9b78d03
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_accounts_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_add_account_holo_light.png b/res/drawable-hdpi/ic_menu_add_account_holo_light.png
deleted file mode 100644
index 9e1251684..000000000
Binary files a/res/drawable-hdpi/ic_menu_add_account_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_attachment_holo_light.png b/res/drawable-hdpi/ic_menu_attachment_holo_light.png
new file mode 100644
index 000000000..14e9a0743
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_attachment_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_cc_holo_light.png b/res/drawable-hdpi/ic_menu_cc_holo_light.png
deleted file mode 100644
index 59f0dafef..000000000
Binary files a/res/drawable-hdpi/ic_menu_cc_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_check_holo_light.png b/res/drawable-hdpi/ic_menu_check_holo_light.png
index f84d80a58..7dd8cfc62 100644
Binary files a/res/drawable-hdpi/ic_menu_check_holo_light.png and b/res/drawable-hdpi/ic_menu_check_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_compose_holo_light.png b/res/drawable-hdpi/ic_menu_compose_holo_light.png
deleted file mode 100644
index df0641f7b..000000000
Binary files a/res/drawable-hdpi/ic_menu_compose_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png b/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png
new file mode 100644
index 000000000..b590822e4
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_edit_holo_light.png b/res/drawable-hdpi/ic_menu_edit_holo_light.png
new file mode 100644
index 000000000..5e9d02990
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_edit_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index bcc52482c..000000000
Binary files a/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index 385410426..000000000
Binary files a/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_help_holo_light.png b/res/drawable-hdpi/ic_menu_help_holo_light.png
new file mode 100644
index 000000000..8ce232c0a
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_help_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_more_holo_light.png b/res/drawable-hdpi/ic_menu_more_holo_light.png
new file mode 100644
index 000000000..4eea579d7
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_more_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_newer.png b/res/drawable-hdpi/ic_menu_newer.png
deleted file mode 100644
index 5e7f7d820..000000000
Binary files a/res/drawable-hdpi/ic_menu_newer.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_older.png b/res/drawable-hdpi/ic_menu_older.png
deleted file mode 100644
index fc7c79835..000000000
Binary files a/res/drawable-hdpi/ic_menu_older.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_save_draft_holo_light.png b/res/drawable-hdpi/ic_menu_save_draft_holo_light.png
new file mode 100644
index 000000000..18129c4e6
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_save_draft_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_settings_holo_light.png b/res/drawable-hdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 000000000..951e59ab4
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_settings_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png b/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png
new file mode 100644
index 000000000..dc73d2e99
Binary files /dev/null and b/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_newer_arrow_holo_light.png b/res/drawable-hdpi/ic_newer_arrow_holo_light.png
new file mode 100644
index 000000000..065bdd6e7
Binary files /dev/null and b/res/drawable-hdpi/ic_newer_arrow_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png b/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png
new file mode 100644
index 000000000..6a08afa30
Binary files /dev/null and b/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_older_arrow_holo_light.png b/res/drawable-hdpi/ic_older_arrow_holo_light.png
new file mode 100644
index 000000000..47cbf8676
Binary files /dev/null and b/res/drawable-hdpi/ic_older_arrow_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_reply.png b/res/drawable-hdpi/ic_reply.png
new file mode 100644
index 000000000..0816a5129
Binary files /dev/null and b/res/drawable-hdpi/ic_reply.png differ
diff --git a/res/drawable-hdpi/ic_reply_all.png b/res/drawable-hdpi/ic_reply_all.png
new file mode 100644
index 000000000..0da72bb13
Binary files /dev/null and b/res/drawable-hdpi/ic_reply_all.png differ
diff --git a/res/drawable-hdpi/ic_spam_normal_holo_light.png b/res/drawable-hdpi/ic_spam_normal_holo_light.png
new file mode 100644
index 000000000..21a0fa639
Binary files /dev/null and b/res/drawable-hdpi/ic_spam_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/list_activated_holo.9.png b/res/drawable-hdpi/list_activated_holo.9.png
index 7b89319c9..046b24a96 100644
Binary files a/res/drawable-hdpi/list_activated_holo.9.png and b/res/drawable-hdpi/list_activated_holo.9.png differ
diff --git a/res/drawable-hdpi/list_arrow_activated_holo.9.png b/res/drawable-hdpi/list_arrow_activated_holo.9.png
new file mode 100644
index 000000000..4eb34c6a6
Binary files /dev/null and b/res/drawable-hdpi/list_arrow_activated_holo.9.png differ
diff --git a/res/drawable-hdpi/list_arrow_focused_holo.9.png b/res/drawable-hdpi/list_arrow_focused_holo.9.png
new file mode 100644
index 000000000..92e9c0ce8
Binary files /dev/null and b/res/drawable-hdpi/list_arrow_focused_holo.9.png differ
diff --git a/res/drawable-hdpi/list_arrow_pressed_holo.9.png b/res/drawable-hdpi/list_arrow_pressed_holo.9.png
new file mode 100644
index 000000000..3acd9aab0
Binary files /dev/null and b/res/drawable-hdpi/list_arrow_pressed_holo.9.png differ
diff --git a/res/drawable-hdpi/list_arrow_selected_holo.9.png b/res/drawable-hdpi/list_arrow_selected_holo.9.png
index 287086dd4..b68d64ff6 100644
Binary files a/res/drawable-hdpi/list_arrow_selected_holo.9.png and b/res/drawable-hdpi/list_arrow_selected_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_wide_read_focused_holo.9.png b/res/drawable-hdpi/list_conversation_wide_read_focused_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_read_focused_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_read_focused_holo.9.png
diff --git a/res/drawable-sw600dp-hdpi/list_wide_read_normal_holo.9.png b/res/drawable-hdpi/list_conversation_wide_read_normal_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_read_normal_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_read_normal_holo.9.png
diff --git a/res/drawable-sw600dp-hdpi/list_wide_read_pressed_holo.9.png b/res/drawable-hdpi/list_conversation_wide_read_pressed_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_read_pressed_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_read_pressed_holo.9.png
diff --git a/res/drawable-sw600dp-hdpi/list_wide_read_selected_holo.9.png b/res/drawable-hdpi/list_conversation_wide_read_selected_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_read_selected_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_read_selected_holo.9.png
diff --git a/res/drawable-sw600dp-hdpi/list_wide_unread_focused_holo.9.png b/res/drawable-hdpi/list_conversation_wide_unread_focused_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_unread_focused_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_unread_focused_holo.9.png
diff --git a/res/drawable-sw600dp-hdpi/list_wide_unread_normal_holo.9.png b/res/drawable-hdpi/list_conversation_wide_unread_normal_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_unread_normal_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_unread_normal_holo.9.png
diff --git a/res/drawable-sw600dp-hdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-hdpi/list_conversation_wide_unread_pressed_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_unread_pressed_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_unread_pressed_holo.9.png
diff --git a/res/drawable-sw600dp-hdpi/list_wide_unread_selected_holo.9.png b/res/drawable-hdpi/list_conversation_wide_unread_selected_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-hdpi/list_wide_unread_selected_holo.9.png
rename to res/drawable-hdpi/list_conversation_wide_unread_selected_holo.9.png
diff --git a/res/drawable-hdpi/list_div_email_widget_holo.9.png b/res/drawable-hdpi/list_div_email_widget_holo.9.png
deleted file mode 100644
index 12b4cf2f2..000000000
Binary files a/res/drawable-hdpi/list_div_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png b/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png
index 2b30e1b2d..8c54379ef 100644
Binary files a/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png and b/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png differ
diff --git a/res/drawable-hdpi/message_header_bg_holo.9.png b/res/drawable-hdpi/message_header_bg_holo.9.png
deleted file mode 100644
index 3914056fe..000000000
Binary files a/res/drawable-hdpi/message_header_bg_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/stat_notify_email_generic.png b/res/drawable-hdpi/stat_notify_email_generic.png
index c85d0f89e..d40e2fe1e 100644
Binary files a/res/drawable-hdpi/stat_notify_email_generic.png and b/res/drawable-hdpi/stat_notify_email_generic.png differ
diff --git a/res/drawable-hdpi/text_box.9.png b/res/drawable-hdpi/text_box.9.png
deleted file mode 100644
index 3bfc8a8d9..000000000
Binary files a/res/drawable-hdpi/text_box.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/attached_image_placeholder.png b/res/drawable-mdpi/attached_image_placeholder.png
deleted file mode 100644
index 90acbf772..000000000
Binary files a/res/drawable-mdpi/attached_image_placeholder.png and /dev/null differ
diff --git a/res/drawable-mdpi/attachment_bg_holo.9.png b/res/drawable-mdpi/attachment_bg_holo.9.png
new file mode 100644
index 000000000..040bbd04d
Binary files /dev/null and b/res/drawable-mdpi/attachment_bg_holo.9.png differ
diff --git a/res/drawable-mdpi/banner_background_search.9.png b/res/drawable-mdpi/banner_background_search.9.png
new file mode 100644
index 000000000..0e5970edd
Binary files /dev/null and b/res/drawable-mdpi/banner_background_search.9.png differ
diff --git a/res/drawable-mdpi/bg_dragdrop.9.png b/res/drawable-mdpi/bg_dragdrop.9.png
deleted file mode 100644
index 998d20654..000000000
Binary files a/res/drawable-mdpi/bg_dragdrop.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/bg_row_email_widget_holo.9.png b/res/drawable-mdpi/bg_row_email_widget_holo.9.png
deleted file mode 100644
index 27059438c..000000000
Binary files a/res/drawable-mdpi/bg_row_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/bg_row_read_email_widget_holo.9.png b/res/drawable-mdpi/bg_row_read_email_widget_holo.9.png
deleted file mode 100644
index 490bffc0f..000000000
Binary files a/res/drawable-mdpi/bg_row_read_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-mdpi/btn_check_off_normal_holo_light.png
index 2a9175739..f1b9c7ace 100644
Binary files a/res/drawable-mdpi/btn_check_off_normal_holo_light.png and b/res/drawable-mdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-mdpi/btn_check_on_normal_holo_light.png
index adcd47c59..aede5316a 100644
Binary files a/res/drawable-mdpi/btn_check_on_normal_holo_light.png and b/res/drawable-mdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_ic_new_email_email_widget_holo_dark.png b/res/drawable-mdpi/btn_ic_new_email_email_widget_holo_dark.png
deleted file mode 100644
index c6713fa40..000000000
Binary files a/res/drawable-mdpi/btn_ic_new_email_email_widget_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_maybe_focused.png b/res/drawable-mdpi/btn_maybe_focused.png
deleted file mode 100644
index c1784337b..000000000
Binary files a/res/drawable-mdpi/btn_maybe_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_maybe_off.png b/res/drawable-mdpi/btn_maybe_off.png
index cf641777d..2a22a27ce 100644
Binary files a/res/drawable-mdpi/btn_maybe_off.png and b/res/drawable-mdpi/btn_maybe_off.png differ
diff --git a/res/drawable-mdpi/btn_maybe_pressed.png b/res/drawable-mdpi/btn_maybe_pressed.png
deleted file mode 100644
index f64da9757..000000000
Binary files a/res/drawable-mdpi/btn_maybe_pressed.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_no_focused.png b/res/drawable-mdpi/btn_no_focused.png
deleted file mode 100644
index 120c92858..000000000
Binary files a/res/drawable-mdpi/btn_no_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_no_off.png b/res/drawable-mdpi/btn_no_off.png
deleted file mode 100644
index b2b1d2735..000000000
Binary files a/res/drawable-mdpi/btn_no_off.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_no_off.png.png b/res/drawable-mdpi/btn_no_off.png.png
new file mode 100644
index 000000000..4e8590e46
Binary files /dev/null and b/res/drawable-mdpi/btn_no_off.png.png differ
diff --git a/res/drawable-mdpi/btn_no_pressed.png b/res/drawable-mdpi/btn_no_pressed.png
deleted file mode 100644
index c1da8c476..000000000
Binary files a/res/drawable-mdpi/btn_no_pressed.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_star_off_convo_holo_light.png b/res/drawable-mdpi/btn_star_off_convo_holo_light.png
new file mode 100644
index 000000000..af65e65c6
Binary files /dev/null and b/res/drawable-mdpi/btn_star_off_convo_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png
new file mode 100644
index 000000000..7c0d5ad90
Binary files /dev/null and b/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_holo_light.png b/res/drawable-mdpi/btn_star_off_normal_holo_light.png
index d4d39b97b..fe5fd3522 100644
Binary files a/res/drawable-mdpi/btn_star_off_normal_holo_light.png and b/res/drawable-mdpi/btn_star_off_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_on_convo_holo_light.png b/res/drawable-mdpi/btn_star_on_convo_holo_light.png
new file mode 100644
index 000000000..1c2997a1d
Binary files /dev/null and b/res/drawable-mdpi/btn_star_on_convo_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png
new file mode 100644
index 000000000..23a63b46f
Binary files /dev/null and b/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_holo_light.png b/res/drawable-mdpi/btn_star_on_normal_holo_light.png
index 60360c028..96faed7f1 100644
Binary files a/res/drawable-mdpi/btn_star_on_normal_holo_light.png and b/res/drawable-mdpi/btn_star_on_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_yes_focused.png b/res/drawable-mdpi/btn_yes_focused.png
deleted file mode 100644
index d54808a25..000000000
Binary files a/res/drawable-mdpi/btn_yes_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_yes_off.png b/res/drawable-mdpi/btn_yes_off.png
deleted file mode 100644
index 3eda3b40f..000000000
Binary files a/res/drawable-mdpi/btn_yes_off.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_yes_off.png.png b/res/drawable-mdpi/btn_yes_off.png.png
new file mode 100644
index 000000000..0bad66971
Binary files /dev/null and b/res/drawable-mdpi/btn_yes_off.png.png differ
diff --git a/res/drawable-mdpi/btn_yes_pressed.png b/res/drawable-mdpi/btn_yes_pressed.png
deleted file mode 100644
index 7e04010e8..000000000
Binary files a/res/drawable-mdpi/btn_yes_pressed.png and /dev/null differ
diff --git a/res/drawable-mdpi/divider_horizontal_email.9.png b/res/drawable-mdpi/divider_horizontal_email.9.png
deleted file mode 100644
index 1f56364f2..000000000
Binary files a/res/drawable-mdpi/divider_horizontal_email.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/email_quoted_bar.9.png b/res/drawable-mdpi/email_quoted_bar.9.png
deleted file mode 100644
index 3d197d5c8..000000000
Binary files a/res/drawable-mdpi/email_quoted_bar.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/expander_close_holo_light.9.png b/res/drawable-mdpi/expander_close_holo_light.9.png
new file mode 100644
index 000000000..2ea966809
Binary files /dev/null and b/res/drawable-mdpi/expander_close_holo_light.9.png differ
diff --git a/res/drawable-mdpi/expander_open_holo_light.9.png b/res/drawable-mdpi/expander_open_holo_light.9.png
new file mode 100644
index 000000000..28b9ec76f
Binary files /dev/null and b/res/drawable-mdpi/expander_open_holo_light.9.png differ
diff --git a/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png b/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png
index d2292732e..8d319d1d7 100644
Binary files a/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png and b/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png differ
diff --git a/res/drawable-mdpi/header_bg_email_widget_holo.9.png b/res/drawable-mdpi/header_bg_email_widget_holo.9.png
new file mode 100644
index 000000000..500cc4c41
Binary files /dev/null and b/res/drawable-mdpi/header_bg_email_widget_holo.9.png differ
diff --git a/res/drawable-mdpi/header_bg_email_widget_holo.png b/res/drawable-mdpi/header_bg_email_widget_holo.png
deleted file mode 100644
index 59860df46..000000000
Binary files a/res/drawable-mdpi/header_bg_email_widget_holo.png and /dev/null differ
diff --git a/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png b/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png
new file mode 100644
index 000000000..2afef3c34
Binary files /dev/null and b/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png differ
diff --git a/res/drawable-mdpi/header_row_focused_email_widget_holo.9.png b/res/drawable-mdpi/header_row_focused_email_widget_holo.9.png
deleted file mode 100644
index f5c695b84..000000000
Binary files a/res/drawable-mdpi/header_row_focused_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/header_row_press_email_widget_holo.9.png b/res/drawable-mdpi/header_row_press_email_widget_holo.9.png
deleted file mode 100644
index 5a24f254c..000000000
Binary files a/res/drawable-mdpi/header_row_press_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_attachment_holo_light.png b/res/drawable-mdpi/ic_attachment_holo_light.png
index a5ae007ed..07413d61f 100644
Binary files a/res/drawable-mdpi/ic_attachment_holo_light.png and b/res/drawable-mdpi/ic_attachment_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_badge_attachment.png b/res/drawable-mdpi/ic_badge_attachment.png
index e934e2632..7ce9ecf30 100644
Binary files a/res/drawable-mdpi/ic_badge_attachment.png and b/res/drawable-mdpi/ic_badge_attachment.png differ
diff --git a/res/drawable-mdpi/ic_badge_attachment_widget.png b/res/drawable-mdpi/ic_badge_attachment_widget.png
deleted file mode 100644
index 74f6319f3..000000000
Binary files a/res/drawable-mdpi/ic_badge_attachment_widget.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_badge_forward_holo_light.png b/res/drawable-mdpi/ic_badge_forward_holo_light.png
new file mode 100644
index 000000000..7e801b8cd
Binary files /dev/null and b/res/drawable-mdpi/ic_badge_forward_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_badge_invite.png b/res/drawable-mdpi/ic_badge_invite.png
deleted file mode 100644
index 2bd12115a..000000000
Binary files a/res/drawable-mdpi/ic_badge_invite.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_badge_invite_holo_light.png b/res/drawable-mdpi/ic_badge_invite_holo_light.png
new file mode 100644
index 000000000..febdc6dd7
Binary files /dev/null and b/res/drawable-mdpi/ic_badge_invite_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_badge_invite_widget.png b/res/drawable-mdpi/ic_badge_invite_widget.png
deleted file mode 100644
index ffb1a9430..000000000
Binary files a/res/drawable-mdpi/ic_badge_invite_widget.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png b/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png
new file mode 100644
index 000000000..c46ba10f4
Binary files /dev/null and b/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_badge_reply_holo_light.png b/res/drawable-mdpi/ic_badge_reply_holo_light.png
new file mode 100644
index 000000000..7a7b07b8e
Binary files /dev/null and b/res/drawable-mdpi/ic_badge_reply_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_cancel_holo_light.png b/res/drawable-mdpi/ic_cancel_holo_light.png
deleted file mode 100644
index 56705c333..000000000
Binary files a/res/drawable-mdpi/ic_cancel_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_cc_holo_light.png b/res/drawable-mdpi/ic_cc_holo_light.png
new file mode 100644
index 000000000..d35ad8059
Binary files /dev/null and b/res/drawable-mdpi/ic_cc_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_edit_holo_dark.png b/res/drawable-mdpi/ic_edit_holo_dark.png
new file mode 100644
index 000000000..66b595e7a
Binary files /dev/null and b/res/drawable-mdpi/ic_edit_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_email_email_widget_holo.png b/res/drawable-mdpi/ic_email_email_widget_holo.png
deleted file mode 100644
index 7aac0abe3..000000000
Binary files a/res/drawable-mdpi/ic_email_email_widget_holo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_event_email.png b/res/drawable-mdpi/ic_event_email.png
deleted file mode 100644
index 559bc13de..000000000
Binary files a/res/drawable-mdpi/ic_event_email.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_exchange_minitab_selected.png b/res/drawable-mdpi/ic_exchange_minitab_selected.png
index da21d526b..ef7e11657 100644
Binary files a/res/drawable-mdpi/ic_exchange_minitab_selected.png and b/res/drawable-mdpi/ic_exchange_minitab_selected.png differ
diff --git a/res/drawable-mdpi/ic_exchange_selected.png b/res/drawable-mdpi/ic_exchange_selected.png
index 5c91e2157..116340678 100644
Binary files a/res/drawable-mdpi/ic_exchange_selected.png and b/res/drawable-mdpi/ic_exchange_selected.png differ
diff --git a/res/drawable-mdpi/ic_folder_star_holo_light.png b/res/drawable-mdpi/ic_folder_star_holo_light.png
deleted file mode 100644
index f9db6772f..000000000
Binary files a/res/drawable-mdpi/ic_folder_star_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_folder_trash_holo_light.png b/res/drawable-mdpi/ic_folder_trash_holo_light.png
deleted file mode 100644
index c1245492b..000000000
Binary files a/res/drawable-mdpi/ic_folder_trash_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_gmail_draft.png b/res/drawable-mdpi/ic_gmail_draft.png
new file mode 100644
index 000000000..2392d6f76
Binary files /dev/null and b/res/drawable-mdpi/ic_gmail_draft.png differ
diff --git a/res/drawable-mdpi/ic_list_spam.png b/res/drawable-mdpi/ic_list_spam.png
deleted file mode 100644
index f9e7957fd..000000000
Binary files a/res/drawable-mdpi/ic_list_spam.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png
index 5233fe0de..f96d5b358 100644
Binary files a/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png and b/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_accounts_holo_light.png b/res/drawable-mdpi/ic_menu_accounts_holo_light.png
new file mode 100644
index 000000000..d8cc9216e
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_accounts_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_add_account_holo_light.png b/res/drawable-mdpi/ic_menu_add_account_holo_light.png
deleted file mode 100644
index cdbe568ce..000000000
Binary files a/res/drawable-mdpi/ic_menu_add_account_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_attachment_holo_light.png b/res/drawable-mdpi/ic_menu_attachment_holo_light.png
new file mode 100644
index 000000000..22419cbab
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_attachment_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_cc_holo_light.png b/res/drawable-mdpi/ic_menu_cc_holo_light.png
deleted file mode 100644
index a1547376e..000000000
Binary files a/res/drawable-mdpi/ic_menu_cc_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_check_holo_light.png b/res/drawable-mdpi/ic_menu_check_holo_light.png
index 1c29f03be..ff4e4fed0 100644
Binary files a/res/drawable-mdpi/ic_menu_check_holo_light.png and b/res/drawable-mdpi/ic_menu_check_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
deleted file mode 100644
index a64773da5..000000000
Binary files a/res/drawable-mdpi/ic_menu_compose_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png b/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png
new file mode 100644
index 000000000..4f194f891
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_edit_holo_light.png b/res/drawable-mdpi/ic_menu_edit_holo_light.png
new file mode 100644
index 000000000..af3f9ad43
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_edit_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index f240e0b71..000000000
Binary files a/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index bfef864ae..000000000
Binary files a/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_help_holo_light.png b/res/drawable-mdpi/ic_menu_help_holo_light.png
new file mode 100644
index 000000000..f6be90a25
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_help_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_more_holo_light.png b/res/drawable-mdpi/ic_menu_more_holo_light.png
new file mode 100644
index 000000000..f7d08a981
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_more_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_newer.png b/res/drawable-mdpi/ic_menu_newer.png
deleted file mode 100644
index 01dcaeb12..000000000
Binary files a/res/drawable-mdpi/ic_menu_newer.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_older.png b/res/drawable-mdpi/ic_menu_older.png
deleted file mode 100644
index 157ec89ea..000000000
Binary files a/res/drawable-mdpi/ic_menu_older.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_save_draft_holo_light.png b/res/drawable-mdpi/ic_menu_save_draft_holo_light.png
new file mode 100644
index 000000000..cbbea78f3
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_save_draft_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_settings_holo_light.png b/res/drawable-mdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 000000000..ddb9877a2
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_settings_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_newer_arrow_disabled_holo_light.png b/res/drawable-mdpi/ic_newer_arrow_disabled_holo_light.png
new file mode 100644
index 000000000..4c24026f0
Binary files /dev/null and b/res/drawable-mdpi/ic_newer_arrow_disabled_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_newer_arrow_holo_light.png b/res/drawable-mdpi/ic_newer_arrow_holo_light.png
new file mode 100644
index 000000000..02d528909
Binary files /dev/null and b/res/drawable-mdpi/ic_newer_arrow_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_older_arrow_disabled_holo_light.png b/res/drawable-mdpi/ic_older_arrow_disabled_holo_light.png
new file mode 100644
index 000000000..1e5a11d93
Binary files /dev/null and b/res/drawable-mdpi/ic_older_arrow_disabled_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_older_arrow_holo_light.png b/res/drawable-mdpi/ic_older_arrow_holo_light.png
new file mode 100644
index 000000000..3b72b1329
Binary files /dev/null and b/res/drawable-mdpi/ic_older_arrow_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_reply.png b/res/drawable-mdpi/ic_reply.png
new file mode 100644
index 000000000..55288fa96
Binary files /dev/null and b/res/drawable-mdpi/ic_reply.png differ
diff --git a/res/drawable-mdpi/ic_reply_all.png b/res/drawable-mdpi/ic_reply_all.png
new file mode 100644
index 000000000..4cb89d67f
Binary files /dev/null and b/res/drawable-mdpi/ic_reply_all.png differ
diff --git a/res/drawable-mdpi/ic_spam_normal_holo_light.png b/res/drawable-mdpi/ic_spam_normal_holo_light.png
new file mode 100644
index 000000000..5abe49320
Binary files /dev/null and b/res/drawable-mdpi/ic_spam_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/list_activated_holo.9.png b/res/drawable-mdpi/list_activated_holo.9.png
index 4d98919db..1ff337370 100644
Binary files a/res/drawable-mdpi/list_activated_holo.9.png and b/res/drawable-mdpi/list_activated_holo.9.png differ
diff --git a/res/drawable-mdpi/list_arrow_activated_holo.9.png b/res/drawable-mdpi/list_arrow_activated_holo.9.png
new file mode 100644
index 000000000..909201484
Binary files /dev/null and b/res/drawable-mdpi/list_arrow_activated_holo.9.png differ
diff --git a/res/drawable-mdpi/list_arrow_focused_holo.9.png b/res/drawable-mdpi/list_arrow_focused_holo.9.png
new file mode 100644
index 000000000..756bb9c52
Binary files /dev/null and b/res/drawable-mdpi/list_arrow_focused_holo.9.png differ
diff --git a/res/drawable-mdpi/list_arrow_pressed_holo.9.png b/res/drawable-mdpi/list_arrow_pressed_holo.9.png
new file mode 100644
index 000000000..1cdd3cbc8
Binary files /dev/null and b/res/drawable-mdpi/list_arrow_pressed_holo.9.png differ
diff --git a/res/drawable-mdpi/list_arrow_selected_holo.9.png b/res/drawable-mdpi/list_arrow_selected_holo.9.png
index 313990499..7cedfb7d9 100644
Binary files a/res/drawable-mdpi/list_arrow_selected_holo.9.png and b/res/drawable-mdpi/list_arrow_selected_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_wide_read_focused_holo.9.png b/res/drawable-mdpi/list_conversation_wide_read_focused_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_read_focused_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_read_focused_holo.9.png
diff --git a/res/drawable-sw600dp-mdpi/list_wide_read_normal_holo.9.png b/res/drawable-mdpi/list_conversation_wide_read_normal_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_read_normal_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_read_normal_holo.9.png
diff --git a/res/drawable-sw600dp-mdpi/list_wide_read_pressed_holo.9.png b/res/drawable-mdpi/list_conversation_wide_read_pressed_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_read_pressed_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_read_pressed_holo.9.png
diff --git a/res/drawable-sw600dp-mdpi/list_wide_read_selected_holo.9.png b/res/drawable-mdpi/list_conversation_wide_read_selected_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_read_selected_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_read_selected_holo.9.png
diff --git a/res/drawable-sw600dp-mdpi/list_wide_unread_focused_holo.9.png b/res/drawable-mdpi/list_conversation_wide_unread_focused_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_unread_focused_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_unread_focused_holo.9.png
diff --git a/res/drawable-sw600dp-mdpi/list_wide_unread_normal_holo.9.png b/res/drawable-mdpi/list_conversation_wide_unread_normal_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_unread_normal_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_unread_normal_holo.9.png
diff --git a/res/drawable-sw600dp-mdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-mdpi/list_conversation_wide_unread_pressed_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_unread_pressed_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_unread_pressed_holo.9.png
diff --git a/res/drawable-sw600dp-mdpi/list_wide_unread_selected_holo.9.png b/res/drawable-mdpi/list_conversation_wide_unread_selected_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-mdpi/list_wide_unread_selected_holo.9.png
rename to res/drawable-mdpi/list_conversation_wide_unread_selected_holo.9.png
diff --git a/res/drawable-mdpi/list_div_email_widget_holo.9.png b/res/drawable-mdpi/list_div_email_widget_holo.9.png
deleted file mode 100644
index fffcc3e8f..000000000
Binary files a/res/drawable-mdpi/list_div_email_widget_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png b/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png
index 0cf20336b..7d59de26c 100644
Binary files a/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png and b/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png differ
diff --git a/res/drawable-mdpi/message_header_bg_holo.9.png b/res/drawable-mdpi/message_header_bg_holo.9.png
deleted file mode 100644
index bca045c27..000000000
Binary files a/res/drawable-mdpi/message_header_bg_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/stat_notify_email_generic.png b/res/drawable-mdpi/stat_notify_email_generic.png
index 8f348c763..e8ede3a2d 100644
Binary files a/res/drawable-mdpi/stat_notify_email_generic.png and b/res/drawable-mdpi/stat_notify_email_generic.png differ
diff --git a/res/drawable-mdpi/text_box.9.png b/res/drawable-mdpi/text_box.9.png
deleted file mode 100644
index e7d4207b8..000000000
Binary files a/res/drawable-mdpi/text_box.9.png and /dev/null differ
diff --git a/res/drawable-sw600dp-hdpi/banner_background_search.9.png b/res/drawable-sw600dp-hdpi/banner_background_search.9.png
new file mode 100644
index 000000000..c3448d92c
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/banner_background_search.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 000000000..402bef332
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 000000000..0e49c5e9b
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png
new file mode 100644
index 000000000..985ca74c9
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png
new file mode 100644
index 000000000..f500c6754
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_read_focused_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_focused_holo.9.png
new file mode 100644
index 000000000..fed41040f
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_focused_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_read_normal_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_normal_holo.9.png
new file mode 100644
index 000000000..93e1b1580
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_normal_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_read_pressed_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_pressed_holo.9.png
new file mode 100644
index 000000000..d4f3087ee
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_pressed_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_read_selected_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_selected_holo.9.png
new file mode 100644
index 000000000..7504792bc
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_read_selected_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_focused_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_focused_holo.9.png
new file mode 100644
index 000000000..e521267e4
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_focused_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_normal_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_normal_holo.9.png
new file mode 100644
index 000000000..82d354fc3
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_normal_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_pressed_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_pressed_holo.9.png
new file mode 100644
index 000000000..133b97f3e
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_pressed_holo.9.png differ
diff --git a/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_selected_holo.9.png b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_selected_holo.9.png
new file mode 100644
index 000000000..d9108686d
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/list_conversation_wide_unread_selected_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/banner_background_search.9.png b/res/drawable-sw600dp-mdpi/banner_background_search.9.png
new file mode 100644
index 000000000..587c3a2ec
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/banner_background_search.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 000000000..f1b9c7ace
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 000000000..aede5316a
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png
new file mode 100644
index 000000000..a4d414043
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png
new file mode 100644
index 000000000..fb9324706
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_read_focused_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_focused_holo.9.png
new file mode 100644
index 000000000..bad010bc3
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_focused_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_read_normal_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_normal_holo.9.png
new file mode 100644
index 000000000..d0181046b
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_normal_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_read_pressed_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_pressed_holo.9.png
new file mode 100644
index 000000000..4c3cbac2f
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_pressed_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_read_selected_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_selected_holo.9.png
new file mode 100644
index 000000000..7f81ee05b
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_read_selected_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_focused_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_focused_holo.9.png
new file mode 100644
index 000000000..c9b9ef8b6
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_focused_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_normal_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_normal_holo.9.png
new file mode 100644
index 000000000..bd11029f5
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_normal_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_pressed_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_pressed_holo.9.png
new file mode 100644
index 000000000..16ffb3d6d
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_pressed_holo.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_selected_holo.9.png b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_selected_holo.9.png
new file mode 100644
index 000000000..f6e0b68e6
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/list_conversation_wide_unread_selected_holo.9.png differ
diff --git a/res/drawable-sw600dp-xhdpi/banner_background_search.9.png b/res/drawable-sw600dp-xhdpi/banner_background_search.9.png
new file mode 100644
index 000000000..02fafa20a
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/banner_background_search.9.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 000000000..2863acf82
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 000000000..121986c2d
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png
new file mode 100644
index 000000000..e740d9bc0
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png
new file mode 100644
index 000000000..c5154174e
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_read_focused_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_read_focused_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_read_focused_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_read_focused_holo.9.png
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_read_normal_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_read_normal_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_read_normal_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_read_normal_holo.9.png
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_read_pressed_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_read_pressed_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_read_pressed_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_read_pressed_holo.9.png
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_read_selected_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_read_selected_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_read_selected_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_read_selected_holo.9.png
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_unread_focused_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_focused_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_unread_focused_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_focused_holo.9.png
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_unread_normal_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_normal_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_unread_normal_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_normal_holo.9.png
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_pressed_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_unread_pressed_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_pressed_holo.9.png
diff --git a/res/drawable-sw600dp-xhdpi/list_wide_unread_selected_holo.9.png b/res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_selected_holo.9.png
similarity index 100%
rename from res/drawable-sw600dp-xhdpi/list_wide_unread_selected_holo.9.png
rename to res/drawable-sw600dp-xhdpi/list_conversation_wide_unread_selected_holo.9.png
diff --git a/res/drawable-xhdpi/attachment_bg_holo.9.png b/res/drawable-xhdpi/attachment_bg_holo.9.png
new file mode 100644
index 000000000..b59af1df1
Binary files /dev/null and b/res/drawable-xhdpi/attachment_bg_holo.9.png differ
diff --git a/res/drawable-xhdpi/banner_background_search.9.png b/res/drawable-xhdpi/banner_background_search.9.png
new file mode 100644
index 000000000..17540618b
Binary files /dev/null and b/res/drawable-xhdpi/banner_background_search.9.png differ
diff --git a/res/drawable-xhdpi/btn_check_off_normal_holo_light.png b/res/drawable-xhdpi/btn_check_off_normal_holo_light.png
index cb2521805..6b4dc88d7 100644
Binary files a/res/drawable-xhdpi/btn_check_off_normal_holo_light.png and b/res/drawable-xhdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_check_on_normal_holo_light.png b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png
index 516c6029e..e5f34af71 100644
Binary files a/res/drawable-xhdpi/btn_check_on_normal_holo_light.png and b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_maybe_off.png b/res/drawable-xhdpi/btn_maybe_off.png
new file mode 100644
index 000000000..59c7a4ad1
Binary files /dev/null and b/res/drawable-xhdpi/btn_maybe_off.png differ
diff --git a/res/drawable-xhdpi/btn_no_off.png.png b/res/drawable-xhdpi/btn_no_off.png.png
new file mode 100644
index 000000000..c8bcae49b
Binary files /dev/null and b/res/drawable-xhdpi/btn_no_off.png.png differ
diff --git a/res/drawable-xhdpi/btn_star_off_convo_holo_light.png b/res/drawable-xhdpi/btn_star_off_convo_holo_light.png
new file mode 100644
index 000000000..8edd94cd3
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_off_convo_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png
new file mode 100644
index 000000000..7129d0016
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_holo_light.png b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
index c54172849..0fd2eb8dc 100644
Binary files a/res/drawable-xhdpi/btn_star_off_normal_holo_light.png and b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_on_convo_holo_light.png b/res/drawable-xhdpi/btn_star_on_convo_holo_light.png
new file mode 100644
index 000000000..1974ca690
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_on_convo_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png
new file mode 100644
index 000000000..d91c8bceb
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_holo_light.png b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
index 7fb08710f..b8fca3882 100644
Binary files a/res/drawable-xhdpi/btn_star_on_normal_holo_light.png and b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_yes_off.png.png b/res/drawable-xhdpi/btn_yes_off.png.png
new file mode 100644
index 000000000..97d169b61
Binary files /dev/null and b/res/drawable-xhdpi/btn_yes_off.png.png differ
diff --git a/res/drawable-xhdpi/expander_close_holo_light.9.png b/res/drawable-xhdpi/expander_close_holo_light.9.png
new file mode 100644
index 000000000..333dd24db
Binary files /dev/null and b/res/drawable-xhdpi/expander_close_holo_light.9.png differ
diff --git a/res/drawable-xhdpi/expander_open_holo_light.9.png b/res/drawable-xhdpi/expander_open_holo_light.9.png
new file mode 100644
index 000000000..67ed4c0a1
Binary files /dev/null and b/res/drawable-xhdpi/expander_open_holo_light.9.png differ
diff --git a/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png b/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png
new file mode 100644
index 000000000..b481cade3
Binary files /dev/null and b/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png differ
diff --git a/res/drawable-xhdpi/header_bg_email_widget_holo.9.png b/res/drawable-xhdpi/header_bg_email_widget_holo.9.png
new file mode 100644
index 000000000..fa411415d
Binary files /dev/null and b/res/drawable-xhdpi/header_bg_email_widget_holo.9.png differ
diff --git a/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png b/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png
new file mode 100644
index 000000000..3f57a7bc6
Binary files /dev/null and b/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png differ
diff --git a/res/drawable-xhdpi/ic_attachment_holo_light.png b/res/drawable-xhdpi/ic_attachment_holo_light.png
new file mode 100644
index 000000000..bc0fa9135
Binary files /dev/null and b/res/drawable-xhdpi/ic_attachment_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_badge_attachment.png b/res/drawable-xhdpi/ic_badge_attachment.png
index a3afa6547..8376cdf6e 100644
Binary files a/res/drawable-xhdpi/ic_badge_attachment.png and b/res/drawable-xhdpi/ic_badge_attachment.png differ
diff --git a/res/drawable-xhdpi/ic_badge_forward_holo_light.png b/res/drawable-xhdpi/ic_badge_forward_holo_light.png
new file mode 100644
index 000000000..0f5a80a3d
Binary files /dev/null and b/res/drawable-xhdpi/ic_badge_forward_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_badge_invite_holo_light.png b/res/drawable-xhdpi/ic_badge_invite_holo_light.png
new file mode 100644
index 000000000..b3f1c50a2
Binary files /dev/null and b/res/drawable-xhdpi/ic_badge_invite_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png b/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png
new file mode 100644
index 000000000..79b07e0a4
Binary files /dev/null and b/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_badge_reply_holo_light.png b/res/drawable-xhdpi/ic_badge_reply_holo_light.png
new file mode 100644
index 000000000..3f69cc412
Binary files /dev/null and b/res/drawable-xhdpi/ic_badge_reply_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_cc_holo_light.png b/res/drawable-xhdpi/ic_cc_holo_light.png
new file mode 100644
index 000000000..90d02a273
Binary files /dev/null and b/res/drawable-xhdpi/ic_cc_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_edit_holo_dark.png b/res/drawable-xhdpi/ic_edit_holo_dark.png
new file mode 100644
index 000000000..cf197200f
Binary files /dev/null and b/res/drawable-xhdpi/ic_edit_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_exchange_minitab_selected.png b/res/drawable-xhdpi/ic_exchange_minitab_selected.png
new file mode 100644
index 000000000..af6e1610f
Binary files /dev/null and b/res/drawable-xhdpi/ic_exchange_minitab_selected.png differ
diff --git a/res/drawable-xhdpi/ic_exchange_selected.png b/res/drawable-xhdpi/ic_exchange_selected.png
new file mode 100644
index 000000000..1ae1849f7
Binary files /dev/null and b/res/drawable-xhdpi/ic_exchange_selected.png differ
diff --git a/res/drawable-xhdpi/ic_folder_drafts_holo_light.png b/res/drawable-xhdpi/ic_folder_drafts_holo_light.png
new file mode 100644
index 000000000..52c80368d
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_drafts_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_folder_inbox_holo_light.png b/res/drawable-xhdpi/ic_folder_inbox_holo_light.png
new file mode 100644
index 000000000..11a61b895
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_inbox_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_folder_outbox_holo_light.png b/res/drawable-xhdpi/ic_folder_outbox_holo_light.png
new file mode 100644
index 000000000..dcd34485d
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_outbox_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_folder_sent_holo_light.png b/res/drawable-xhdpi/ic_folder_sent_holo_light.png
new file mode 100644
index 000000000..0baa77ce7
Binary files /dev/null and b/res/drawable-xhdpi/ic_folder_sent_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_forward_holo_dark.png b/res/drawable-xhdpi/ic_forward_holo_dark.png
index 95e617e9a..b36b81a05 100644
Binary files a/res/drawable-xhdpi/ic_forward_holo_dark.png and b/res/drawable-xhdpi/ic_forward_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_gmail_draft.png b/res/drawable-xhdpi/ic_gmail_draft.png
new file mode 100644
index 000000000..ce7f0e9b9
Binary files /dev/null and b/res/drawable-xhdpi/ic_gmail_draft.png differ
diff --git a/res/drawable-xhdpi/ic_list_combined_inbox.png b/res/drawable-xhdpi/ic_list_combined_inbox.png
new file mode 100644
index 000000000..11a61b895
Binary files /dev/null and b/res/drawable-xhdpi/ic_list_combined_inbox.png differ
diff --git a/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png
new file mode 100644
index 000000000..bfdad2a2e
Binary files /dev/null and b/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_accounts_holo_light.png b/res/drawable-xhdpi/ic_menu_accounts_holo_light.png
new file mode 100644
index 000000000..47bc9673c
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_accounts_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_attachment_holo_light.png b/res/drawable-xhdpi/ic_menu_attachment_holo_light.png
new file mode 100644
index 000000000..37dde300b
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_attachment_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_cc_holo_light.png b/res/drawable-xhdpi/ic_menu_cc_holo_light.png
deleted file mode 100644
index 61ae39ccf..000000000
Binary files a/res/drawable-xhdpi/ic_menu_cc_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_check_holo_light.png b/res/drawable-xhdpi/ic_menu_check_holo_light.png
index 9c5e5592d..41830253c 100644
Binary files a/res/drawable-xhdpi/ic_menu_check_holo_light.png and b/res/drawable-xhdpi/ic_menu_check_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png b/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png
new file mode 100644
index 000000000..a2d821ae3
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_edit_holo_light.png b/res/drawable-xhdpi/ic_menu_edit_holo_light.png
new file mode 100644
index 000000000..d6f16f878
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_edit_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index ad0c2d39f..000000000
Binary files a/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index 36ab0cf36..000000000
Binary files a/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_help_holo_light.png b/res/drawable-xhdpi/ic_menu_help_holo_light.png
new file mode 100644
index 000000000..ccd5c6c13
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_help_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_more_holo_light.png b/res/drawable-xhdpi/ic_menu_more_holo_light.png
new file mode 100644
index 000000000..61855e43e
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_more_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_move_to_holo_light.png b/res/drawable-xhdpi/ic_menu_move_to_holo_light.png
new file mode 100644
index 000000000..fb136383c
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_move_to_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_newer.png b/res/drawable-xhdpi/ic_menu_newer.png
deleted file mode 100644
index 5fe73ffa0..000000000
Binary files a/res/drawable-xhdpi/ic_menu_newer.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_older.png b/res/drawable-xhdpi/ic_menu_older.png
deleted file mode 100644
index 9ea2be1b4..000000000
Binary files a/res/drawable-xhdpi/ic_menu_older.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_save_draft_holo_light.png b/res/drawable-xhdpi/ic_menu_save_draft_holo_light.png
new file mode 100644
index 000000000..dbd1b7bd8
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_save_draft_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_search_holo_light.png b/res/drawable-xhdpi/ic_menu_search_holo_light.png
index fdcd3f079..4c6aade68 100644
Binary files a/res/drawable-xhdpi/ic_menu_search_holo_light.png and b/res/drawable-xhdpi/ic_menu_search_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_send_holo_light.png b/res/drawable-xhdpi/ic_menu_send_holo_light.png
index 446f05e58..cb83e583b 100644
Binary files a/res/drawable-xhdpi/ic_menu_send_holo_light.png and b/res/drawable-xhdpi/ic_menu_send_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_settings_holo_light.png b/res/drawable-xhdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 000000000..ba048a777
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_settings_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_trash_holo_light.png b/res/drawable-xhdpi/ic_menu_trash_holo_light.png
index 56d68fa2d..203ba4c40 100644
Binary files a/res/drawable-xhdpi/ic_menu_trash_holo_light.png and b/res/drawable-xhdpi/ic_menu_trash_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_newer_arrow_disabled_holo_light.png b/res/drawable-xhdpi/ic_newer_arrow_disabled_holo_light.png
new file mode 100644
index 000000000..6bde91450
Binary files /dev/null and b/res/drawable-xhdpi/ic_newer_arrow_disabled_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_newer_arrow_holo_light.png b/res/drawable-xhdpi/ic_newer_arrow_holo_light.png
new file mode 100644
index 000000000..aba0e9b4a
Binary files /dev/null and b/res/drawable-xhdpi/ic_newer_arrow_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_older_arrow_disabled_holo_light.png b/res/drawable-xhdpi/ic_older_arrow_disabled_holo_light.png
new file mode 100644
index 000000000..6ef30a7b6
Binary files /dev/null and b/res/drawable-xhdpi/ic_older_arrow_disabled_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_older_arrow_holo_light.png b/res/drawable-xhdpi/ic_older_arrow_holo_light.png
new file mode 100644
index 000000000..0f220eac9
Binary files /dev/null and b/res/drawable-xhdpi/ic_older_arrow_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_remove_attachment_holo_light.png b/res/drawable-xhdpi/ic_remove_attachment_holo_light.png
new file mode 100644
index 000000000..587910522
Binary files /dev/null and b/res/drawable-xhdpi/ic_remove_attachment_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_reply.png b/res/drawable-xhdpi/ic_reply.png
new file mode 100644
index 000000000..01467a472
Binary files /dev/null and b/res/drawable-xhdpi/ic_reply.png differ
diff --git a/res/drawable-xhdpi/ic_reply_all.png b/res/drawable-xhdpi/ic_reply_all.png
new file mode 100644
index 000000000..8761b7572
Binary files /dev/null and b/res/drawable-xhdpi/ic_reply_all.png differ
diff --git a/res/drawable-xhdpi/ic_reply_all_holo_dark.png b/res/drawable-xhdpi/ic_reply_all_holo_dark.png
index 4d1d4dd35..3852a1d29 100644
Binary files a/res/drawable-xhdpi/ic_reply_all_holo_dark.png and b/res/drawable-xhdpi/ic_reply_all_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_reply_holo_dark.png b/res/drawable-xhdpi/ic_reply_holo_dark.png
index f929dbf77..6fccf467e 100644
Binary files a/res/drawable-xhdpi/ic_reply_holo_dark.png and b/res/drawable-xhdpi/ic_reply_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_show_images_holo_light.png b/res/drawable-xhdpi/ic_show_images_holo_light.png
new file mode 100644
index 000000000..571bc57a9
Binary files /dev/null and b/res/drawable-xhdpi/ic_show_images_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_spam_normal_holo_light.png b/res/drawable-xhdpi/ic_spam_normal_holo_light.png
new file mode 100644
index 000000000..4edbfe06d
Binary files /dev/null and b/res/drawable-xhdpi/ic_spam_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/list_activated_holo.9.png b/res/drawable-xhdpi/list_activated_holo.9.png
index 4e13add60..2eb7c7ebc 100644
Binary files a/res/drawable-xhdpi/list_activated_holo.9.png and b/res/drawable-xhdpi/list_activated_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_arrow_activated_holo.9.png b/res/drawable-xhdpi/list_arrow_activated_holo.9.png
new file mode 100644
index 000000000..9bd3a1b90
Binary files /dev/null and b/res/drawable-xhdpi/list_arrow_activated_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_arrow_focused_holo.9.png b/res/drawable-xhdpi/list_arrow_focused_holo.9.png
new file mode 100644
index 000000000..b1b531f12
Binary files /dev/null and b/res/drawable-xhdpi/list_arrow_focused_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_arrow_pressed_holo.9.png b/res/drawable-xhdpi/list_arrow_pressed_holo.9.png
new file mode 100644
index 000000000..b694e59c1
Binary files /dev/null and b/res/drawable-xhdpi/list_arrow_pressed_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_arrow_selected_holo.9.png b/res/drawable-xhdpi/list_arrow_selected_holo.9.png
index a630af525..f986c59ac 100644
Binary files a/res/drawable-xhdpi/list_arrow_selected_holo.9.png and b/res/drawable-xhdpi/list_arrow_selected_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_read_focused_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_read_focused_holo.9.png
new file mode 100644
index 000000000..a497ffa25
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_read_focused_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_read_normal_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_read_normal_holo.9.png
new file mode 100644
index 000000000..b89e674eb
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_read_normal_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_read_pressed_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_read_pressed_holo.9.png
new file mode 100644
index 000000000..089baa909
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_read_pressed_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_read_selected_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_read_selected_holo.9.png
new file mode 100644
index 000000000..b97b45cda
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_read_selected_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_unread_focused_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_unread_focused_holo.9.png
new file mode 100644
index 000000000..f9b9254c3
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_unread_focused_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_unread_normal_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_unread_normal_holo.9.png
new file mode 100644
index 000000000..e664d309f
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_unread_normal_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_unread_pressed_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_unread_pressed_holo.9.png
new file mode 100644
index 000000000..d9f8ebc1a
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_unread_pressed_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_conversation_wide_unread_selected_holo.9.png b/res/drawable-xhdpi/list_conversation_wide_unread_selected_holo.9.png
new file mode 100644
index 000000000..65937dd1b
Binary files /dev/null and b/res/drawable-xhdpi/list_conversation_wide_unread_selected_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png b/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png
new file mode 100644
index 000000000..6934c5f0e
Binary files /dev/null and b/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png differ
diff --git a/res/drawable-xhdpi/message_header_bg_holo.9.png b/res/drawable-xhdpi/message_header_bg_holo.9.png
deleted file mode 100644
index bc9ed31fb..000000000
Binary files a/res/drawable-xhdpi/message_header_bg_holo.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/stat_notify_email_generic.png b/res/drawable-xhdpi/stat_notify_email_generic.png
new file mode 100644
index 000000000..0317760ee
Binary files /dev/null and b/res/drawable-xhdpi/stat_notify_email_generic.png differ
diff --git a/res/drawable/btn_invite_maybe.xml b/res/drawable/btn_invite_maybe.xml
deleted file mode 100644
index bb18cdef8..000000000
--- a/res/drawable/btn_invite_maybe.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="false" android:state_pressed="false"
-          android:drawable="@drawable/btn_maybe_off" />
-    <item android:state_focused="true" android:state_pressed="false"
-          android:drawable="@drawable/btn_maybe_focused" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_maybe_pressed" />
-</selector>
diff --git a/res/drawable/btn_invite_no.xml b/res/drawable/btn_invite_no.xml
deleted file mode 100644
index 0d29995d3..000000000
--- a/res/drawable/btn_invite_no.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="false" android:state_pressed="false"
-          android:drawable="@drawable/btn_no_off" />
-    <item android:state_focused="true" android:state_pressed="false"
-          android:drawable="@drawable/btn_no_focused" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_no_pressed" />
-</selector>
diff --git a/res/drawable/btn_invite_yes.xml b/res/drawable/btn_invite_yes.xml
deleted file mode 100644
index 5013fe092..000000000
--- a/res/drawable/btn_invite_yes.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="false" android:state_pressed="false"
-          android:drawable="@drawable/btn_yes_off" />
-    <item android:state_focused="true" android:state_pressed="false"
-          android:drawable="@drawable/btn_yes_focused" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_yes_pressed" />
-</selector>
diff --git a/res/drawable/menu_item_newer.xml b/res/drawable/menu_item_newer.xml
index 49fbf9933..195c1be33 100644
--- a/res/drawable/menu_item_newer.xml
+++ b/res/drawable/menu_item_newer.xml
@@ -15,6 +15,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:drawable="@drawable/ic_menu_newer" />
-    <!-- Transparent when disabled -->
+    <item android:state_enabled="true" android:drawable="@drawable/ic_newer_arrow_holo_light" />
+    <item android:state_enabled="false" android:drawable="@drawable/ic_newer_arrow_disabled_holo_light" />
 </selector>
diff --git a/res/drawable/menu_item_older.xml b/res/drawable/menu_item_older.xml
index eae6969da..42dc10d47 100644
--- a/res/drawable/menu_item_older.xml
+++ b/res/drawable/menu_item_older.xml
@@ -15,6 +15,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:drawable="@drawable/ic_menu_older" />
-    <!-- Transparent when disabled -->
+    <item android:state_enabled="true" android:drawable="@drawable/ic_older_arrow_holo_light" />
+    <item android:state_enabled="false" android:drawable="@drawable/ic_older_arrow_disabled_holo_light" />
 </selector>
diff --git a/res/drawable/message_list_wide_read_selector.xml b/res/drawable/message_list_wide_read_selector.xml
index 4577018a6..f00aa9ab3 100644
--- a/res/drawable/message_list_wide_read_selector.xml
+++ b/res/drawable/message_list_wide_read_selector.xml
@@ -16,13 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/list_wide_read_pressed_holo" />
+          android:drawable="@drawable/list_conversation_wide_read_pressed_holo" />
     <item android:state_selected="true"
-          android:drawable="@drawable/list_wide_read_selected_holo" />
+          android:drawable="@drawable/list_conversation_wide_read_selected_holo" />
     <item android:state_selected="true"
           android:state_activated="true"
-          android:drawable="@drawable/list_wide_read_selected_holo" />
+          android:drawable="@drawable/list_conversation_wide_read_selected_holo" />
     <item android:state_activated="true"
           android:drawable="@drawable/list_activated_holo" />
-    <item android:drawable="@drawable/list_wide_read_normal_holo" />
+    <item android:drawable="@drawable/list_conversation_wide_read_normal_holo" />
 </selector>
diff --git a/res/drawable/widget_header_bg.xml b/res/drawable/widget_header_bg.xml
deleted file mode 100644
index 247a826e9..000000000
--- a/res/drawable/widget_header_bg.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/header_bg_email_widget_holo"
-    android:tileMode="repeat" />
diff --git a/res/drawable/widget_read_conversation_selector.xml b/res/drawable/widget_read_conversation_selector.xml
deleted file mode 100644
index 3e2c3f75c..000000000
--- a/res/drawable/widget_read_conversation_selector.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true"
-          android:drawable="@drawable/header_row_focused_email_widget_holo" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/header_row_press_email_widget_holo" />
-    <item android:drawable="@drawable/bg_row_read_email_widget_holo" />
-</selector>
diff --git a/res/drawable/widget_unread_conversation_selector.xml b/res/drawable/widget_unread_conversation_selector.xml
deleted file mode 100644
index d385f1023..000000000
--- a/res/drawable/widget_unread_conversation_selector.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true"
-          android:drawable="@drawable/header_row_focused_email_widget_holo" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/header_row_press_email_widget_holo" />
-    <item android:drawable="@drawable/bg_row_email_widget_holo" />
-</selector>
diff --git a/res/layout-sw600dp/message_view_attachment.xml b/res/layout-sw600dp/message_view_attachment.xml
index 0e679ade2..b342d200d 100644
--- a/res/layout-sw600dp/message_view_attachment.xml
+++ b/res/layout-sw600dp/message_view_attachment.xml
@@ -27,7 +27,7 @@
         android:layout_width="64dip"
         android:layout_height="match_parent"
         android:layout_weight="0"
-        android:src="@drawable/attached_image_placeholder"
+        android:src="@drawable/ic_attachment_holo_light"
         android:scaleType="fitCenter"
         />
     <LinearLayout
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index ec14a639b..b20f71d73 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -52,18 +52,13 @@
                     android:layout_height="0dip"
                     android:visibility="gone"
                     />
-                <View android:layout_width="match_parent"
-                    android:layout_height="1dip"
-                    android:background="@drawable/divider_horizontal_email"
-                    android:visibility="gone" />
             </LinearLayout>
             <include layout="@layout/message_compose_body"/>
-        <!--  quoted text bar -->
+            <!--  quoted text bar -->
             <RelativeLayout
                 android:id="@+id/quoted_text_bar"
                 android:layout_width="match_parent"
                 android:layout_height="45dip"
-                android:background="@drawable/email_quoted_bar"
                 >
                 <TextView
                     android:layout_width="wrap_content"
@@ -97,4 +92,4 @@
                 />
         </LinearLayout>
     </ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/message_compose_attachment.xml b/res/layout/message_compose_attachment.xml
index 8bd0dc858..70566d5ec 100644
--- a/res/layout/message_compose_attachment.xml
+++ b/res/layout/message_compose_attachment.xml
@@ -45,7 +45,7 @@
 
     <!-- Remove button -->
     <ImageView android:id="@+id/attachment_delete"
-            android:src="@drawable/ic_cancel_holo_light"
+            android:src="@drawable/ic_remove_attachment_holo_light"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="left"
diff --git a/res/layout/message_list_item_normal.xml b/res/layout/message_list_item_normal.xml
index fb4e3fcaa..cd35ea158 100644
--- a/res/layout/message_list_item_normal.xml
+++ b/res/layout/message_list_item_normal.xml
@@ -31,22 +31,23 @@
         android:paddingLeft="8dip"
         android:paddingRight="8dip"
         >
-        <ImageView
-            android:id="@+id/reply_state"
-            android:layout_width="16dip"
-            android:layout_height="16dip"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="10dip"
-            android:src="@drawable/ic_reply_holo_dark"
-            />
         <ImageView
             android:id="@+id/checkmark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="3dip"
-            android:layout_below="@+id/reply_state"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
             android:src="@drawable/btn_check_on_normal_holo_light"
             />
+        <ImageView
+            android:id="@+id/reply_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_above="@+id/checkmark"
+            android:src="@drawable/ic_badge_reply_holo_light"
+            />
     </RelativeLayout>
 
     <!-- No top padding, since the color chips have no padding -
@@ -87,8 +88,7 @@
                 android:layout_width="36dip"
                 android:layout_height="16dip"
                 android:layout_gravity="top"
-                android:layout_marginRight="2dip"
-                android:src="@drawable/ic_attachment_holo_light" />
+                android:src="@drawable/ic_badge_attachment" />
             <TextView
                 android:id="@+id/date"
                 android:layout_width="wrap_content"
diff --git a/res/layout/message_list_item_wide.xml b/res/layout/message_list_item_wide.xml
index a64588018..b3883183f 100644
--- a/res/layout/message_list_item_wide.xml
+++ b/res/layout/message_list_item_wide.xml
@@ -50,7 +50,7 @@
         android:layout_marginLeft="16dip"
         android:layout_marginRight="16dip"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_reply_holo_dark" />
+        android:src="@drawable/ic_badge_reply_holo_light" />
     <TextView
         android:id="@+id/subject"
         android:layout_width="0dip"
@@ -78,6 +78,7 @@
             android:layout_width="36dip"
             android:layout_height="16dip"
             android:layout_centerVertical="true"
+            android:layout_marginRight="4dip"
             android:src="@drawable/ic_attachment_holo_light" />
 
         <TextView
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index 3257bd265..3266bf627 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -44,7 +44,7 @@
             android:id="@+id/attachment_icon"
             android:layout_width="48dip"
             android:layout_height="48dip"
-            android:src="@drawable/attached_image_placeholder"
+            android:src="@drawable/ic_attachment_holo_light"
             />
     </LinearLayout>
     <LinearLayout
diff --git a/res/layout/message_view_header_upper.xml b/res/layout/message_view_header_upper.xml
index 02c9e4360..c89bb8b1a 100644
--- a/res/layout/message_view_header_upper.xml
+++ b/res/layout/message_view_header_upper.xml
@@ -21,8 +21,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/message_header_height"
-    android:paddingBottom="@dimen/message_header_bottom_padding"
-    android:background="@drawable/message_header_bg_holo"
+    android:background="@drawable/header_convo_view_sender_bg_holo"
     android:orientation="horizontal"
     android:gravity="center_vertical"
     >
diff --git a/res/layout/message_view_invitation.xml b/res/layout/message_view_invitation.xml
index 6df4ff952..5efc05b81 100644
--- a/res/layout/message_view_invitation.xml
+++ b/res/layout/message_view_invitation.xml
@@ -22,7 +22,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/text_box"
     >
 
     <RelativeLayout
@@ -37,7 +36,7 @@
              android:ellipsize="end"
              android:text="@string/message_view_invite_title"
              android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/ic_event_email"
+             android:drawableLeft="@drawable/ic_badge_invite_holo_light"
              android:layout_marginLeft="12dip"
              android:layout_alignParentLeft="true"
              android:layout_centerVertical="true"
@@ -95,7 +94,7 @@
              android:text="@string/message_view_invite_accept"
              android:singleLine="true"
              android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/btn_invite_yes"
+             android:drawableLeft="@drawable/btn_yes_off"
              android:gravity="center_vertical"
              android:focusable="true"
              />
@@ -109,7 +108,7 @@
              android:text="@string/message_view_invite_maybe"
              android:singleLine="true"
              android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/btn_invite_maybe"
+             android:drawableLeft="@drawable/btn_maybe_off"
              android:gravity="center_vertical"
              android:focusable="true"
              />
@@ -122,7 +121,7 @@
              android:text="@string/message_view_invite_decline"
              android:singleLine="true"
              android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/btn_invite_no"
+             android:drawableLeft="@drawable/btn_no_off"
              android:gravity="center_vertical"
              android:focusable="true"
              />
diff --git a/res/layout/message_view_subheader.xml b/res/layout/message_view_subheader.xml
index e867a81cc..649ea336a 100644
--- a/res/layout/message_view_subheader.xml
+++ b/res/layout/message_view_subheader.xml
@@ -49,7 +49,7 @@
         <!--  Set proper background to reflect selected state -->
         <ImageView
             android:id="@+id/show_details"
-            android:src="@drawable/ic_menu_expander_minimized_holo_light"
+            android:src="@drawable/expander_open_holo_light"
             android:layout_width="wrap_content"
             android:layout_height="48dip"
             android:layout_marginLeft="4dip"
@@ -72,7 +72,7 @@
              The height here needs to match the height of the collapsed subheader -->
         <ImageView
             android:id="@+id/show_details"
-            android:src="@drawable/ic_menu_expander_maximized_holo_light"
+            android:src="@drawable/expander_close_holo_light"
             android:layout_width="wrap_content"
             android:layout_height="48dip"
             android:layout_marginLeft="4dip"
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index f5117a0c2..71ccd410a 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -18,93 +18,71 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="5dip"
-    android:paddingBottom="2dip"
     android:layout_marginTop="6dip"
-    android:layout_marginBottom="17dip"
-    android:layout_marginLeft="12dip"
-    android:layout_marginRight="12dip"
-    android:orientation="vertical"
-    android:background="@drawable/gradient_bg_email_widget_holo">
+    android:layout_marginBottom="6dip"
+    android:orientation="vertical">
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="42sp"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:orientation="horizontal"
-        android:paddingTop="4dip"
+        android:layout_height="48dip"
+        android:gravity="center_vertical"
         android:paddingLeft="8dip"
         android:paddingRight="8dip"
-        android:background="@drawable/widget_header_bg">
+        android:orientation="horizontal"
+        android:background="@drawable/header_bg_email_widget_holo">
         <ImageView
             android:id="@+id/widget_logo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="1sp"
-            android:paddingRight="8dip"
-            android:src="@drawable/ic_email_email_widget_holo" />
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:layout_marginRight="8dip"
+            android:src="@mipmap/ic_launcher_email" />
         <LinearLayout
             android:id="@+id/widget_header"
-            android:layout_width="wrap_content"
+            android:layout_width="0dip"
             android:layout_height="wrap_content"
-            android:layout_weight = "1"
+            android:layout_weight="1"
             android:orientation="vertical">
             <TextView
                 android:id="@+id/widget_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-1sp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/widget_all_mail"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:textColor="@android:color/white"
-                android:shadowColor="@color/widget_label_shadow_color"
-                android:shadowRadius="3"
-                android:freezesText="true" />
+                android:textColor="@color/widget_title_color"
+                />
             <TextView
                 android:id="@+id/widget_tap"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-5sp"
                 android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:text="@string/widget_other_views"
-                android:textSize="14sp"
-                android:textColor="@color/widget_account_color" />
+                android:textColor="@color/widget_title_color"
+                />
         </LinearLayout>
         <TextView
             android:id="@+id/widget_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-16sp"
-            android:paddingRight="8dip"
-            android:textSize="48sp"
-            android:textColor="@color/widget_unread_count_color"
+            android:layout_marginRight="12dip"
+            android:textSize="36sp"
+            android:textStyle="bold"
+            android:textColor="@color/widget_unread_color"
             android:freezesText="true" />
         <ImageView
             android:id="@+id/widget_compose"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingTop="2dip"
-            android:src="@drawable/btn_ic_new_email_email_widget_holo_dark" />
+            android:src="@drawable/ic_menu_compose_normal_holo_light" />
     </LinearLayout>
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:background="@drawable/list_div_top_btm_email_widget_holo" />
     <ListView
         android:id="@+id/message_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:paddingTop="6dip"
-        android:clipToPadding="false"
-        android:fadingEdge="none"
-        android:divider="@drawable/list_div_email_widget_holo"
-        android:cacheColorHint="#00000000" />
+        android:cacheColorHint="#00000000"
+        android:background="@drawable/gradient_bg_email_widget_holo" />
+
+    <!-- TODO: remove this tap to configure logic. It's obsolete. -->
     <TextView
         android:id="@+id/tap_to_configure"
         android:layout_width="match_parent"
@@ -114,15 +92,11 @@
         android:layout_weight="1"
         android:layout_gravity="fill"
         android:gravity="center"
-        android:paddingTop="6dip"
         android:text="@string/widget_touch_to_configure"
         android:textSize="16sp"
-        android:textColor="@android:color/white"
         android:visibility="gone"/>
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
         android:background="@drawable/list_div_top_btm_email_widget_holo" />
 </LinearLayout>
diff --git a/res/layout/widget_list_item.xml b/res/layout/widget_list_item.xml
index fcd981fd0..b28015b59 100644
--- a/res/layout/widget_list_item.xml
+++ b/res/layout/widget_list_item.xml
@@ -22,7 +22,7 @@
     android:paddingLeft="16dip"
     android:paddingRight="8dip"
     android:orientation="vertical"
-    android:background="@drawable/widget_unread_conversation_selector"
+    android:background="@drawable/message_list_unread_selector"
     >
     <ImageView
         android:id="@+id/color_chip"
@@ -51,13 +51,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="-4sp"
-            android:src="@drawable/ic_badge_invite_widget" />
+            android:src="@drawable/ic_badge_invite_holo_light" />
         <ImageView
             android:id="@+id/widget_attachment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="-4sp"
-            android:src="@drawable/ic_badge_attachment_widget" />
+            android:src="@drawable/ic_attachment_holo_light" />
         <TextView
             android:id="@+id/widget_date"
             android:layout_width="wrap_content"
@@ -70,4 +70,4 @@
         style="@style/widget_list_item"
         android:layout_marginTop="-4sp"
         android:maxLines="2"/>
- </LinearLayout>
\ No newline at end of file
+ </LinearLayout>
diff --git a/res/menu-sw600dp/account_settings_add_account_option.xml b/res/menu-sw600dp/account_settings_add_account_option.xml
index 08af0e326..dc274d81c 100644
--- a/res/menu-sw600dp/account_settings_add_account_option.xml
+++ b/res/menu-sw600dp/account_settings_add_account_option.xml
@@ -18,7 +18,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/add_new_account"
         android:title="@string/add_account_action"
-        android:icon="@drawable/ic_menu_add_account_holo_light"
         android:showAsAction="ifRoom|withText"
     />
 </menu>
diff --git a/res/menu-sw600dp/email_activity_options.xml b/res/menu-sw600dp/email_activity_options.xml
index 0aa77521b..71aebb78c 100644
--- a/res/menu-sw600dp/email_activity_options.xml
+++ b/res/menu-sw600dp/email_activity_options.xml
@@ -22,7 +22,7 @@
         android:orderInCategory="100"
         android:alphabeticShortcut="c"
         android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose_holo_light"
+        android:icon="@drawable/ic_menu_compose_normal_holo_light"
         android:showAsAction="ifRoom"
     />
     <item
diff --git a/res/menu/email_activity_options.xml b/res/menu/email_activity_options.xml
index e0a51f01c..33ee507ef 100644
--- a/res/menu/email_activity_options.xml
+++ b/res/menu/email_activity_options.xml
@@ -22,7 +22,7 @@
         android:orderInCategory="100"
         android:alphabeticShortcut="c"
         android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose_holo_light"
+        android:icon="@drawable/ic_menu_compose_normal_holo_light"
         android:showAsAction="ifRoom"
     />
     <item
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 70bb854b4..5a45b28cb 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -28,7 +28,6 @@
     />
     <item
         android:id="@+id/add_cc_bcc"
-        android:icon="@drawable/ic_menu_cc_holo_light"
         android:title="@string/add_cc_bcc_menu"
     />
     <item
diff --git a/res/mipmap-xhdpi/ic_launcher_email.png b/res/mipmap-xhdpi/ic_launcher_email.png
new file mode 100644
index 000000000..8f6a21668
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_email.png differ
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index a8141ee39..b6ac88285 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -18,7 +18,7 @@
 <resources>
     <!-- Bottom padding used to compensate for the built in drop shadow in the
          asset. -->
-    <dimen name="message_header_height">68dip</dimen>
+    <dimen name="message_header_height">64dip</dimen>
     <dimen name="message_header_bottom_padding">4dip</dimen>
     <dimen name="message_header_badge_width">64dip</dimen>
     <dimen name="message_header_name_margin">16dip</dimen>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1cdcc66e4..c881e6eb9 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -201,9 +201,9 @@
         <!-- TYPE_SENT = 5 -->
         <item>@drawable/ic_folder_sent_holo_light</item>
         <!-- TYPE_TRASH = 6 -->
-        <item>@drawable/ic_folder_trash_holo_light</item>
+        <item>@drawable/ic_menu_trash_holo_light</item>
         <!-- TYPE_JUNK = 7 -->
-        <item>@drawable/ic_list_spam</item>
+        <item>@drawable/ic_spam_normal_holo_light</item>
     </array>
 
     <!-- Account color chips on combined view -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d7026e201..cccb853ac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,11 +57,10 @@
     <color name="mailbox_drop_destructive_bg_color">#fff10000</color>
 
     <!--  Widget colors -->
-    <color name="widget_label_shadow_color">#0d0d0d</color>
-    <color name="widget_account_color">#99ffffff</color>
-    <color name="widget_unread_count_color">#b2ffffff</color>
     <color name="widget_default_text_color">#ff000000</color>
     <color name="widget_light_text_color">#ff666666</color>
+    <color name="widget_title_color">#333333</color>
+    <color name="widget_unread_color">#777777</color>
 
     <color name="message_view_info_back_color">#deecfa</color>
     <color name="message_view_header_color">#3cb8e6</color>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 86581fc29..e633f0a15 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -23,10 +23,7 @@
     <dimen name="message_list_item_color_tip_width">35dip</dimen>
     <dimen name="message_list_item_color_tip_height">6dip</dimen>
 
-    <!-- Bottom padding used to compensate for the built in drop shadow in the
-         asset. -->
-    <dimen name="message_header_height">52dip</dimen>
-    <dimen name="message_header_bottom_padding">4dip</dimen>
+    <dimen name="message_header_height">48dip</dimen>
     <dimen name="message_header_badge_width">48dip</dimen>
     <dimen name="message_header_name_margin">4dip</dimen>
 
diff --git a/src/com/android/email/FolderProperties.java b/src/com/android/email/FolderProperties.java
index e43e3ee47..86c902139 100644
--- a/src/com/android/email/FolderProperties.java
+++ b/src/com/android/email/FolderProperties.java
@@ -61,7 +61,7 @@ public class FolderProperties {
         mSpecialMailboxDrawable =
             context.getResources().obtainTypedArray(R.array.mailbox_display_icons);
         mSummaryStarredMailboxDrawable =
-            context.getResources().getDrawable(R.drawable.ic_folder_star_holo_light);
+            context.getResources().getDrawable(R.drawable.ic_menu_star_holo_light);
         mSummaryCombinedInboxDrawable =
             context.getResources().getDrawable(R.drawable.ic_list_combined_inbox);
     }
diff --git a/src/com/android/email/activity/MessageListFragment.java b/src/com/android/email/activity/MessageListFragment.java
index f7be4e7c0..39e3c1200 100644
--- a/src/com/android/email/activity/MessageListFragment.java
+++ b/src/com/android/email/activity/MessageListFragment.java
@@ -644,7 +644,7 @@ public class MessageListFragment extends ListFragment
             if (sBackground == null || mOldOrientation != newOrientation) {
                 mOldOrientation = newOrientation;
 
-                sBackground = res.getDrawable(R.drawable.bg_dragdrop);
+                sBackground = res.getDrawable(R.drawable.list_pressed_holo);
                 sBackground.setBounds(0, 0, mDragWidth, mDragHeight);
 
                 sDragOffset = (int)res.getDimension(R.dimen.message_list_drag_offset);
diff --git a/src/com/android/email/activity/MessageListItem.java b/src/com/android/email/activity/MessageListItem.java
index edac776ac..1fdcb0b6e 100644
--- a/src/com/android/email/activity/MessageListItem.java
+++ b/src/com/android/email/activity/MessageListItem.java
@@ -156,7 +156,7 @@ public class MessageListItem extends View {
             sBoldPaint.setAntiAlias(true);
             sHighlightPaint.setColor(TextUtilities.HIGHLIGHT_COLOR_INT);
             sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_attachment);
-            sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_invite);
+            sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_invite_holo_light);
             sFavoriteIconOff =
                 BitmapFactory.decodeResource(r, R.drawable.btn_star_off_normal_holo_light);
             sFavoriteIconOn =
@@ -166,13 +166,12 @@ public class MessageListItem extends View {
             sSelectedIconOn =
                 BitmapFactory.decodeResource(r, R.drawable.btn_check_on_normal_holo_light);
 
-            //TODO: put the actual drawables when they exist. these are temps for visibile testing.
             sStateReplied =
-                BitmapFactory.decodeResource(r, R.drawable.ic_reply_holo_dark);
+                BitmapFactory.decodeResource(r, R.drawable.ic_badge_reply_holo_light);
             sStateForwarded =
-                BitmapFactory.decodeResource(r, R.drawable.ic_forward_holo_dark);
+                BitmapFactory.decodeResource(r, R.drawable.ic_badge_forward_holo_light);
             sStateRepliedAndForwarded =
-                BitmapFactory.decodeResource(r, R.drawable.ic_reply_all_holo_dark);
+                BitmapFactory.decodeResource(r, R.drawable.ic_badge_reply_forward_holo_light);
 
             sInit = true;
         }
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index 4839017b5..af5808a50 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -398,9 +398,9 @@ public class EmailWidget implements RemoteViewsService.RemoteViewsFactory,
         RemoteViews views =
             new RemoteViews(mContext.getPackageName(), R.layout.widget_list_item);
         boolean isUnread = mCursor.getInt(EmailWidgetLoader.WIDGET_COLUMN_FLAG_READ) != 1;
-        int drawableId = R.drawable.widget_read_conversation_selector;
+        int drawableId = R.drawable.message_list_read_selector;
         if (isUnread) {
-            drawableId = R.drawable.widget_unread_conversation_selector;
+            drawableId = R.drawable.message_list_unread_selector;
         }
         views.setInt(R.id.widget_message, "setBackgroundResource", drawableId);