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 d59326e6c..dce5e73e5 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 d1e2f3af5..26726f6cb 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_star_off_focused_holo_light.png b/res/drawable-hdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 000000000..3f01154d5
Binary files /dev/null and b/res/drawable-hdpi/btn_star_off_focused_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
new file mode 100644
index 000000000..47598b4af
Binary files /dev/null and b/res/drawable-hdpi/btn_star_off_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_off_pressed_holo_light.png b/res/drawable-hdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 000000000..0a78b6cd5
Binary files /dev/null and b/res/drawable-hdpi/btn_star_off_pressed_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_on_focused_holo_light.png b/res/drawable-hdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 000000000..854b12694
Binary files /dev/null and b/res/drawable-hdpi/btn_star_on_focused_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
new file mode 100644
index 000000000..34d8ea194
Binary files /dev/null and b/res/drawable-hdpi/btn_star_on_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_on_pressed_holo_light.png b/res/drawable-hdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 000000000..0a78b6cd5
Binary files /dev/null and b/res/drawable-hdpi/btn_star_on_pressed_holo_light.png differ
diff --git a/res/drawable-hdpi/forward.png b/res/drawable-hdpi/forward.png
deleted file mode 100644
index 869ae5550..000000000
Binary files a/res/drawable-hdpi/forward.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_forward.png b/res/drawable-hdpi/ic_forward.png
deleted file mode 100644
index b9ebfc15f..000000000
Binary files a/res/drawable-hdpi/ic_forward.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_forward_holo_dark.png b/res/drawable-hdpi/ic_forward_holo_dark.png
new file mode 100644
index 000000000..31a5c8daf
Binary files /dev/null and b/res/drawable-hdpi/ic_forward_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_reply.png b/res/drawable-hdpi/ic_reply.png
deleted file mode 100644
index 354c5c28a..000000000
Binary files a/res/drawable-hdpi/ic_reply.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_reply_all.png b/res/drawable-hdpi/ic_reply_all.png
deleted file mode 100644
index ec7347ad6..000000000
Binary files a/res/drawable-hdpi/ic_reply_all.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_reply_all_holo_dark.png b/res/drawable-hdpi/ic_reply_all_holo_dark.png
new file mode 100644
index 000000000..e2130a3ca
Binary files /dev/null and b/res/drawable-hdpi/ic_reply_all_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_reply_holo_dark.png b/res/drawable-hdpi/ic_reply_holo_dark.png
new file mode 100644
index 000000000..1f5dd613a
Binary files /dev/null and b/res/drawable-hdpi/ic_reply_holo_dark.png differ
diff --git a/res/drawable-hdpi/list_activated_holo.9.png b/res/drawable-hdpi/list_activated_holo.9.png
index 12a379ba2..7b89319c9 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_focused_holo.9.png b/res/drawable-hdpi/list_focused_holo.9.png
new file mode 100644
index 000000000..e962ce81a
Binary files /dev/null and b/res/drawable-hdpi/list_focused_holo.9.png differ
diff --git a/res/drawable-hdpi/list_message_focused_holo.9.png b/res/drawable-hdpi/list_message_focused_holo.9.png
deleted file mode 100644
index 8121eaa8e..000000000
Binary files a/res/drawable-hdpi/list_message_focused_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_message_pressed_holo.9.png b/res/drawable-hdpi/list_message_pressed_holo.9.png
deleted file mode 100644
index 62e97324c..000000000
Binary files a/res/drawable-hdpi/list_message_pressed_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_message_read_holo.9.png b/res/drawable-hdpi/list_message_read_holo.9.png
deleted file mode 100644
index cbe63aa5e..000000000
Binary files a/res/drawable-hdpi/list_message_read_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_message_unread_holo.9.png b/res/drawable-hdpi/list_message_unread_holo.9.png
deleted file mode 100644
index 62e1ac0bb..000000000
Binary files a/res/drawable-hdpi/list_message_unread_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_message_wide_read_normal_holo.9.png b/res/drawable-hdpi/list_message_wide_read_normal_holo.9.png
deleted file mode 100644
index 834ca092a..000000000
Binary files a/res/drawable-hdpi/list_message_wide_read_normal_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_message_wide_unread_normal_holo.9.png b/res/drawable-hdpi/list_message_wide_unread_normal_holo.9.png
deleted file mode 100644
index 75073e76e..000000000
Binary files a/res/drawable-hdpi/list_message_wide_unread_normal_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_message_wide_unread_pressed_holo.9.png b/res/drawable-hdpi/list_message_wide_unread_pressed_holo.9.png
deleted file mode 100644
index 15e45236f..000000000
Binary files a/res/drawable-hdpi/list_message_wide_unread_pressed_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_pressed_holo.9.png b/res/drawable-hdpi/list_pressed_holo.9.png
new file mode 100644
index 000000000..dd183c0a2
Binary files /dev/null and b/res/drawable-hdpi/list_pressed_holo.9.png differ
diff --git a/res/drawable-hdpi/list_read_holo.9.png b/res/drawable-hdpi/list_read_holo.9.png
new file mode 100644
index 000000000..e44a18ef3
Binary files /dev/null and b/res/drawable-hdpi/list_read_holo.9.png differ
diff --git a/res/drawable-hdpi/list_unread_holo.9.png b/res/drawable-hdpi/list_unread_holo.9.png
new file mode 100644
index 000000000..5c048b236
Binary files /dev/null and b/res/drawable-hdpi/list_unread_holo.9.png differ
diff --git a/res/drawable-hdpi/list_wide_read_normal_holo.9.png b/res/drawable-hdpi/list_wide_read_normal_holo.9.png
new file mode 100644
index 000000000..5ee766a47
Binary files /dev/null and b/res/drawable-hdpi/list_wide_read_normal_holo.9.png differ
diff --git a/res/drawable-hdpi/list_wide_read_pressed_holo.9.png b/res/drawable-hdpi/list_wide_read_pressed_holo.9.png
new file mode 100644
index 000000000..61a1d6fa5
Binary files /dev/null and b/res/drawable-hdpi/list_wide_read_pressed_holo.9.png differ
diff --git a/res/drawable-hdpi/list_conversation_wide_read_selected_holo.9.png b/res/drawable-hdpi/list_wide_read_selected_holo.9.png
similarity index 100%
rename from res/drawable-hdpi/list_conversation_wide_read_selected_holo.9.png
rename to res/drawable-hdpi/list_wide_read_selected_holo.9.png
diff --git a/res/drawable-hdpi/list_wide_unread_normal_holo.9.png b/res/drawable-hdpi/list_wide_unread_normal_holo.9.png
new file mode 100644
index 000000000..c184876a3
Binary files /dev/null and b/res/drawable-hdpi/list_wide_unread_normal_holo.9.png differ
diff --git a/res/drawable-hdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-hdpi/list_wide_unread_pressed_holo.9.png
new file mode 100644
index 000000000..d6bf649e4
Binary files /dev/null and b/res/drawable-hdpi/list_wide_unread_pressed_holo.9.png differ
diff --git a/res/drawable-hdpi/list_conversation_wide_unread_selected_holo.9.png b/res/drawable-hdpi/list_wide_unread_selected_holo.9.png
similarity index 100%
rename from res/drawable-hdpi/list_conversation_wide_unread_selected_holo.9.png
rename to res/drawable-hdpi/list_wide_unread_selected_holo.9.png
diff --git a/res/drawable-hdpi/message_list_activated_holo.9.png b/res/drawable-hdpi/message_list_activated_holo.9.png
deleted file mode 100644
index 34fa61cd7..000000000
Binary files a/res/drawable-hdpi/message_list_activated_holo.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/reply.png b/res/drawable-hdpi/reply.png
deleted file mode 100644
index 738161081..000000000
Binary files a/res/drawable-hdpi/reply.png and /dev/null differ
diff --git a/res/drawable-hdpi/reply_all.png b/res/drawable-hdpi/reply_all.png
deleted file mode 100644
index 3d81a3cf7..000000000
Binary files a/res/drawable-hdpi/reply_all.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 50bf00fe5..2a9175739 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 11b1ef4d7..adcd47c59 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_star_off_focused_holo_light.png b/res/drawable-mdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 000000000..4e17ab6ef
Binary files /dev/null and b/res/drawable-mdpi/btn_star_off_focused_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
new file mode 100644
index 000000000..d4d39b97b
Binary files /dev/null and b/res/drawable-mdpi/btn_star_off_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_off_pressed_holo_light.png b/res/drawable-mdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 000000000..eb4384c8e
Binary files /dev/null and b/res/drawable-mdpi/btn_star_off_pressed_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_on_focused_holo_light.png b/res/drawable-mdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 000000000..ba6cef639
Binary files /dev/null and b/res/drawable-mdpi/btn_star_on_focused_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
new file mode 100644
index 000000000..60360c028
Binary files /dev/null and b/res/drawable-mdpi/btn_star_on_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_on_pressed_holo_light.png b/res/drawable-mdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 000000000..eb4384c8e
Binary files /dev/null and b/res/drawable-mdpi/btn_star_on_pressed_holo_light.png differ
diff --git a/res/drawable-mdpi/forward.png b/res/drawable-mdpi/forward.png
deleted file mode 100644
index ffdf13972..000000000
Binary files a/res/drawable-mdpi/forward.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_forward.png b/res/drawable-mdpi/ic_forward.png
deleted file mode 100644
index ba252fd25..000000000
Binary files a/res/drawable-mdpi/ic_forward.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_forward_holo_dark.png b/res/drawable-mdpi/ic_forward_holo_dark.png
new file mode 100644
index 000000000..9bdd226a4
Binary files /dev/null and b/res/drawable-mdpi/ic_forward_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_reply.png b/res/drawable-mdpi/ic_reply.png
deleted file mode 100644
index e10eb0e27..000000000
Binary files a/res/drawable-mdpi/ic_reply.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_reply_all.png b/res/drawable-mdpi/ic_reply_all.png
deleted file mode 100644
index 48d1f6297..000000000
Binary files a/res/drawable-mdpi/ic_reply_all.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_reply_all_holo_dark.png b/res/drawable-mdpi/ic_reply_all_holo_dark.png
new file mode 100644
index 000000000..bdeaf5632
Binary files /dev/null and b/res/drawable-mdpi/ic_reply_all_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_reply_holo_dark.png b/res/drawable-mdpi/ic_reply_holo_dark.png
new file mode 100644
index 000000000..d234bb2e5
Binary files /dev/null and b/res/drawable-mdpi/ic_reply_holo_dark.png differ
diff --git a/res/drawable-mdpi/list_activated_holo.9.png b/res/drawable-mdpi/list_activated_holo.9.png
index f162c9ac2..4d98919db 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_focused_holo.9.png b/res/drawable-mdpi/list_focused_holo.9.png
new file mode 100644
index 000000000..6e041f344
Binary files /dev/null and b/res/drawable-mdpi/list_focused_holo.9.png differ
diff --git a/res/drawable-mdpi/list_message_focused_holo.9.png b/res/drawable-mdpi/list_message_focused_holo.9.png
deleted file mode 100644
index ed10678e7..000000000
Binary files a/res/drawable-mdpi/list_message_focused_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_message_pressed_holo.9.png b/res/drawable-mdpi/list_message_pressed_holo.9.png
deleted file mode 100644
index 594218849..000000000
Binary files a/res/drawable-mdpi/list_message_pressed_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_message_read_holo.9.png b/res/drawable-mdpi/list_message_read_holo.9.png
deleted file mode 100644
index e455c5427..000000000
Binary files a/res/drawable-mdpi/list_message_read_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_message_unread_holo.9.png b/res/drawable-mdpi/list_message_unread_holo.9.png
deleted file mode 100644
index d7f48391e..000000000
Binary files a/res/drawable-mdpi/list_message_unread_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_message_wide_read_normal_holo.9.png b/res/drawable-mdpi/list_message_wide_read_normal_holo.9.png
deleted file mode 100644
index 511bfd20e..000000000
Binary files a/res/drawable-mdpi/list_message_wide_read_normal_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_message_wide_unread_normal_holo.9.png b/res/drawable-mdpi/list_message_wide_unread_normal_holo.9.png
deleted file mode 100644
index ac01772e9..000000000
Binary files a/res/drawable-mdpi/list_message_wide_unread_normal_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_message_wide_unread_pressed_holo.9.png b/res/drawable-mdpi/list_message_wide_unread_pressed_holo.9.png
deleted file mode 100644
index c4f6c0aa4..000000000
Binary files a/res/drawable-mdpi/list_message_wide_unread_pressed_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_pressed_holo.9.png b/res/drawable-mdpi/list_pressed_holo.9.png
new file mode 100644
index 000000000..9358dd8b5
Binary files /dev/null and b/res/drawable-mdpi/list_pressed_holo.9.png differ
diff --git a/res/drawable-mdpi/list_read_holo.9.png b/res/drawable-mdpi/list_read_holo.9.png
new file mode 100644
index 000000000..b17496402
Binary files /dev/null and b/res/drawable-mdpi/list_read_holo.9.png differ
diff --git a/res/drawable-mdpi/list_unread_holo.9.png b/res/drawable-mdpi/list_unread_holo.9.png
new file mode 100644
index 000000000..27af63358
Binary files /dev/null and b/res/drawable-mdpi/list_unread_holo.9.png differ
diff --git a/res/drawable-mdpi/list_wide_read_normal_holo.9.png b/res/drawable-mdpi/list_wide_read_normal_holo.9.png
new file mode 100644
index 000000000..83ba74d31
Binary files /dev/null and b/res/drawable-mdpi/list_wide_read_normal_holo.9.png differ
diff --git a/res/drawable-mdpi/list_wide_read_pressed_holo.9.png b/res/drawable-mdpi/list_wide_read_pressed_holo.9.png
new file mode 100644
index 000000000..337ac1075
Binary files /dev/null and b/res/drawable-mdpi/list_wide_read_pressed_holo.9.png differ
diff --git a/res/drawable-mdpi/list_conversation_wide_read_selected_holo.9.png b/res/drawable-mdpi/list_wide_read_selected_holo.9.png
similarity index 100%
rename from res/drawable-mdpi/list_conversation_wide_read_selected_holo.9.png
rename to res/drawable-mdpi/list_wide_read_selected_holo.9.png
diff --git a/res/drawable-mdpi/list_wide_unread_normal_holo.9.png b/res/drawable-mdpi/list_wide_unread_normal_holo.9.png
new file mode 100644
index 000000000..4b6f1b9cf
Binary files /dev/null and b/res/drawable-mdpi/list_wide_unread_normal_holo.9.png differ
diff --git a/res/drawable-mdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-mdpi/list_wide_unread_pressed_holo.9.png
new file mode 100644
index 000000000..596e2ba1e
Binary files /dev/null and b/res/drawable-mdpi/list_wide_unread_pressed_holo.9.png differ
diff --git a/res/drawable-mdpi/list_conversation_wide_unread_selected_holo.9.png b/res/drawable-mdpi/list_wide_unread_selected_holo.9.png
similarity index 100%
rename from res/drawable-mdpi/list_conversation_wide_unread_selected_holo.9.png
rename to res/drawable-mdpi/list_wide_unread_selected_holo.9.png
diff --git a/res/drawable-mdpi/message_list_activated_holo.9.png b/res/drawable-mdpi/message_list_activated_holo.9.png
deleted file mode 100644
index f2acd9006..000000000
Binary files a/res/drawable-mdpi/message_list_activated_holo.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/reply.png b/res/drawable-mdpi/reply.png
deleted file mode 100644
index 0f33a8603..000000000
Binary files a/res/drawable-mdpi/reply.png and /dev/null differ
diff --git a/res/drawable-mdpi/reply_all.png b/res/drawable-mdpi/reply_all.png
deleted file mode 100644
index a6dfa3e78..000000000
Binary files a/res/drawable-mdpi/reply_all.png and /dev/null 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..d59326e6c
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..d1e2f3af5
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_focused_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 000000000..7b214bc1a
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_star_off_focused_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_normal_holo_light.png
similarity index 100%
rename from res/drawable-hdpi/btn_star_off_normal_email_holo_light.png
rename to res/drawable-sw600dp-hdpi/btn_star_off_normal_holo_light.png
diff --git a/res/drawable-sw600dp-hdpi/btn_star_off_pressed_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 000000000..df0946536
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_star_off_pressed_holo_light.png differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_on_focused_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 000000000..6b0db08a4
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_star_on_focused_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_normal_holo_light.png
similarity index 100%
rename from res/drawable-hdpi/btn_star_on_normal_email_holo_light.png
rename to res/drawable-sw600dp-hdpi/btn_star_on_normal_holo_light.png
diff --git a/res/drawable-sw600dp-hdpi/btn_star_on_pressed_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 000000000..8e33b30bc
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/btn_star_on_pressed_holo_light.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..50bf00fe5
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..11b1ef4d7
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_focused_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 000000000..55d906d6e
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_star_off_focused_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_normal_holo_light.png
similarity index 100%
rename from res/drawable-mdpi/btn_star_off_normal_email_holo_light.png
rename to res/drawable-sw600dp-mdpi/btn_star_off_normal_holo_light.png
diff --git a/res/drawable-sw600dp-mdpi/btn_star_off_pressed_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 000000000..4f7324af7
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_star_off_pressed_holo_light.png differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_on_focused_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 000000000..f3cdbc9fb
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_star_on_focused_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_normal_holo_light.png
similarity index 100%
rename from res/drawable-mdpi/btn_star_on_normal_email_holo_light.png
rename to res/drawable-sw600dp-mdpi/btn_star_on_normal_holo_light.png
diff --git a/res/drawable-sw600dp-mdpi/btn_star_on_pressed_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 000000000..2001f9ef1
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/btn_star_on_pressed_holo_light.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..933e06bc8
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..88d077b8f
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_focused_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 000000000..1f02ca992
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_off_focused_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_holo_light.png
new file mode 100644
index 000000000..30b8af337
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_pressed_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 000000000..a2772dd22
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_off_pressed_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_focused_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 000000000..65c9ff093
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_on_focused_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_holo_light.png
new file mode 100644
index 000000000..8b5bee993
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_holo_light.png differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_pressed_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 000000000..38e5d27d8
Binary files /dev/null and b/res/drawable-sw600dp-xhdpi/btn_star_on_pressed_holo_light.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
new file mode 100644
index 000000000..cb2521805
Binary files /dev/null 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
new file mode 100644
index 000000000..516c6029e
Binary files /dev/null and b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_off_focused_holo_light.png b/res/drawable-xhdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 000000000..5701ed7e3
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_off_focused_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
new file mode 100644
index 000000000..c54172849
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png b/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 000000000..4e4697a26
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_on_focused_holo_light.png b/res/drawable-xhdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 000000000..c9cd02105
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_on_focused_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
new file mode 100644
index 000000000..7fb08710f
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png b/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 000000000..4e4697a26
Binary files /dev/null and b/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_forward_holo_dark.png b/res/drawable-xhdpi/ic_forward_holo_dark.png
new file mode 100644
index 000000000..33d4b345b
Binary files /dev/null and b/res/drawable-xhdpi/ic_forward_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_reply_all_holo_dark.png b/res/drawable-xhdpi/ic_reply_all_holo_dark.png
new file mode 100644
index 000000000..33f81d852
Binary files /dev/null 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
new file mode 100644
index 000000000..3ca85b55c
Binary files /dev/null and b/res/drawable-xhdpi/ic_reply_holo_dark.png differ
diff --git a/res/drawable-xhdpi/list_activated_holo.9.png b/res/drawable-xhdpi/list_activated_holo.9.png
new file mode 100644
index 000000000..4e13add60
Binary files /dev/null and b/res/drawable-xhdpi/list_activated_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
new file mode 100644
index 000000000..a630af525
Binary files /dev/null and b/res/drawable-xhdpi/list_arrow_selected_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_focused_holo.9.png b/res/drawable-xhdpi/list_focused_holo.9.png
new file mode 100644
index 000000000..9c90c2bdf
Binary files /dev/null and b/res/drawable-xhdpi/list_focused_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_pressed_holo.9.png b/res/drawable-xhdpi/list_pressed_holo.9.png
new file mode 100644
index 000000000..d0fc7e057
Binary files /dev/null and b/res/drawable-xhdpi/list_pressed_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_read_holo.9.png b/res/drawable-xhdpi/list_read_holo.9.png
new file mode 100644
index 000000000..bad29185f
Binary files /dev/null and b/res/drawable-xhdpi/list_read_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_selected_holo.9.png b/res/drawable-xhdpi/list_selected_holo.9.png
new file mode 100644
index 000000000..a3008b027
Binary files /dev/null and b/res/drawable-xhdpi/list_selected_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_unread_holo.9.png b/res/drawable-xhdpi/list_unread_holo.9.png
new file mode 100644
index 000000000..d32c4c3ea
Binary files /dev/null and b/res/drawable-xhdpi/list_unread_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_wide_read_normal_holo.9.png b/res/drawable-xhdpi/list_wide_read_normal_holo.9.png
new file mode 100644
index 000000000..26e32f0cd
Binary files /dev/null and b/res/drawable-xhdpi/list_wide_read_normal_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_wide_read_pressed_holo.9.png b/res/drawable-xhdpi/list_wide_read_pressed_holo.9.png
new file mode 100644
index 000000000..366f945a4
Binary files /dev/null and b/res/drawable-xhdpi/list_wide_read_pressed_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_wide_read_selected_holo.9.png b/res/drawable-xhdpi/list_wide_read_selected_holo.9.png
new file mode 100644
index 000000000..2803bf0bb
Binary files /dev/null and b/res/drawable-xhdpi/list_wide_read_selected_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_wide_unread_normal_holo.9.png b/res/drawable-xhdpi/list_wide_unread_normal_holo.9.png
new file mode 100644
index 000000000..05c6130eb
Binary files /dev/null and b/res/drawable-xhdpi/list_wide_unread_normal_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-xhdpi/list_wide_unread_pressed_holo.9.png
new file mode 100644
index 000000000..d4cfa2ff4
Binary files /dev/null and b/res/drawable-xhdpi/list_wide_unread_pressed_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_wide_unread_selected_holo.9.png b/res/drawable-xhdpi/list_wide_unread_selected_holo.9.png
new file mode 100644
index 000000000..caac304fe
Binary files /dev/null and b/res/drawable-xhdpi/list_wide_unread_selected_holo.9.png differ
diff --git a/res/drawable/message_list_item_background_read.xml b/res/drawable/message_list_item_background_read.xml
deleted file mode 100644
index c973783ba..000000000
--- a/res/drawable/message_list_item_background_read.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/res/drawable/message_list_item_background_unread.xml b/res/drawable/message_list_item_background_unread.xml
deleted file mode 100644
index cdba2bc79..000000000
--- a/res/drawable/message_list_item_background_unread.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/res/drawable/message_list_read_selector.xml b/res/drawable/message_list_read_selector.xml
index 72ea2311d..b57f802b9 100644
--- a/res/drawable/message_list_read_selector.xml
+++ b/res/drawable/message_list_read_selector.xml
@@ -16,13 +16,15 @@
+ android:drawable="@drawable/list_focused_holo" />
+
+ android:drawable="@drawable/list_activated_holo" />
-
+
diff --git a/res/drawable/message_list_unread_selector.xml b/res/drawable/message_list_unread_selector.xml
index 3c043ec7d..206a1db2c 100644
--- a/res/drawable/message_list_unread_selector.xml
+++ b/res/drawable/message_list_unread_selector.xml
@@ -16,15 +16,15 @@
+ android:drawable="@drawable/list_focused_holo" />
+ android:drawable="@drawable/list_pressed_holo" />
+ android:drawable="@drawable/list_activated_holo" />
-
+
diff --git a/res/drawable/message_list_wide_read_selector.xml b/res/drawable/message_list_wide_read_selector.xml
index 68eb8ad48..c523a09d7 100644
--- a/res/drawable/message_list_wide_read_selector.xml
+++ b/res/drawable/message_list_wide_read_selector.xml
@@ -15,7 +15,9 @@
-->
+
-
+ android:drawable="@drawable/list_wide_read_selected_holo" />
+
diff --git a/res/drawable/message_list_wide_unread_selector.xml b/res/drawable/message_list_wide_unread_selector.xml
index f92c5f14f..5d817fdd6 100644
--- a/res/drawable/message_list_wide_unread_selector.xml
+++ b/res/drawable/message_list_wide_unread_selector.xml
@@ -16,8 +16,8 @@
+ android:drawable="@drawable/list_wide_unread_pressed_holo" />
-
+ android:drawable="@drawable/list_wide_unread_selected_holo" />
+
diff --git a/res/layout-land/message_view_header_actions.xml b/res/layout-land/message_view_header_actions.xml
index df668e734..df098f819 100644
--- a/res/layout-land/message_view_header_actions.xml
+++ b/res/layout-land/message_view_header_actions.xml
@@ -17,14 +17,14 @@
+ android:src="@drawable/ic_reply_holo_dark" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
diff --git a/res/layout-sw600dp/message_list_item_normal.xml b/res/layout-sw600dp/message_list_item_normal.xml
index e1fb3d642..41c7e9c6a 100644
--- a/res/layout-sw600dp/message_list_item_normal.xml
+++ b/res/layout-sw600dp/message_list_item_normal.xml
@@ -41,7 +41,7 @@
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
diff --git a/res/layout-sw600dp/message_list_item_wide.xml b/res/layout-sw600dp/message_list_item_wide.xml
index 7ecbf1f3e..226d67067 100644
--- a/res/layout-sw600dp/message_list_item_wide.xml
+++ b/res/layout-sw600dp/message_list_item_wide.xml
@@ -49,7 +49,7 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index 0af6f71ea..a634c76a0 100644
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
@@ -96,7 +96,7 @@
android:id="@+id/reply"
android:layout_marginRight="16dip"
android:contentDescription="@string/reply_action"
- android:src="@drawable/ic_reply"
+ android:src="@drawable/ic_reply_holo_dark"
android:visibility="gone"
style="@style/message_view_action_buttons"
/>
@@ -104,7 +104,7 @@
android:id="@+id/reply_all"
android:layout_marginRight="16dip"
android:contentDescription="@string/reply_all_action"
- android:src="@drawable/ic_reply_all"
+ android:src="@drawable/ic_reply_all_holo_dark"
android:visibility="gone"
style="@style/message_view_action_buttons"
/>
@@ -112,14 +112,14 @@
android:id="@+id/forward"
android:layout_marginRight="16dip"
android:contentDescription="@string/forward_action"
- android:src="@drawable/ic_forward"
+ android:src="@drawable/ic_forward_holo_dark"
android:visibility="gone"
style="@style/message_view_action_buttons"
/>
diff --git a/res/layout/message_list_item_narrow.xml b/res/layout/message_list_item_narrow.xml
index f01bf42f5..08a264e9f 100644
--- a/res/layout/message_list_item_narrow.xml
+++ b/res/layout/message_list_item_narrow.xml
@@ -40,7 +40,7 @@
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
diff --git a/res/layout/message_list_item_normal.xml b/res/layout/message_list_item_normal.xml
index f01bf42f5..08a264e9f 100644
--- a/res/layout/message_list_item_normal.xml
+++ b/res/layout/message_list_item_normal.xml
@@ -40,7 +40,7 @@
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
diff --git a/res/layout/message_list_item_wide.xml b/res/layout/message_list_item_wide.xml
index 7ecbf1f3e..226d67067 100644
--- a/res/layout/message_list_item_wide.xml
+++ b/res/layout/message_list_item_wide.xml
@@ -49,7 +49,7 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
diff --git a/res/layout/message_view_header_actions.xml b/res/layout/message_view_header_actions.xml
index 6ff4bdcf8..537e82fd0 100644
--- a/res/layout/message_view_header_actions.xml
+++ b/res/layout/message_view_header_actions.xml
@@ -17,14 +17,14 @@