diff --git a/res/drawable-hdpi/btn_check_buttonless_off.png b/res/drawable-hdpi/btn_check_buttonless_off.png
deleted file mode 100644
index 27991acbd..000000000
Binary files a/res/drawable-hdpi/btn_check_buttonless_off.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_check_buttonless_on.png b/res/drawable-hdpi/btn_check_buttonless_on.png
deleted file mode 100644
index 47c8a75fe..000000000
Binary files a/res/drawable-hdpi/btn_check_buttonless_on.png and /dev/null differ
diff --git a/res/drawable-hdpi/colorpicker_arrow.png b/res/drawable-hdpi/colorpicker_arrow.png
deleted file mode 100644
index a7a24862d..000000000
Binary files a/res/drawable-hdpi/colorpicker_arrow.png and /dev/null differ
diff --git a/res/drawable-hdpi/colorpicker_menjadi.png b/res/drawable-hdpi/colorpicker_menjadi.png
deleted file mode 100644
index b6c41f667..000000000
Binary files a/res/drawable-hdpi/colorpicker_menjadi.png and /dev/null differ
diff --git a/res/drawable-hdpi/colorpicker_spyglass.png b/res/drawable-hdpi/colorpicker_spyglass.png
deleted file mode 100644
index c3a51e31d..000000000
Binary files a/res/drawable-hdpi/colorpicker_spyglass.png and /dev/null differ
diff --git a/res/drawable-hdpi/divider_dark.9.png b/res/drawable-hdpi/divider_dark.9.png
deleted file mode 100644
index 986ab0b97..000000000
Binary files a/res/drawable-hdpi/divider_dark.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/divider_light.9.png b/res/drawable-hdpi/divider_light.9.png
deleted file mode 100644
index 0279e17a1..000000000
Binary files a/res/drawable-hdpi/divider_light.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/envelope.png b/res/drawable-hdpi/envelope.png
deleted file mode 100644
index b225af9bc..000000000
Binary files a/res/drawable-hdpi/envelope.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_toggle_flag_dark.png b/res/drawable-hdpi/ic_action_toggle_flag_dark.png
deleted file mode 100755
index dd047af3f..000000000
Binary files a/res/drawable-hdpi/ic_action_toggle_flag_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_toggle_flag_light.png b/res/drawable-hdpi/ic_action_toggle_flag_light.png
deleted file mode 100644
index e7a143b4b..000000000
Binary files a/res/drawable-hdpi/ic_action_toggle_flag_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_toggle_read_dark.png b/res/drawable-hdpi/ic_action_toggle_read_dark.png
deleted file mode 100644
index d3c6893f1..000000000
Binary files a/res/drawable-hdpi/ic_action_toggle_read_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_toggle_read_light.png b/res/drawable-hdpi/ic_action_toggle_read_light.png
deleted file mode 100644
index 0ed1e97d5..000000000
Binary files a/res/drawable-hdpi/ic_action_toggle_read_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_archive.png b/res/drawable-hdpi/ic_button_archive.png
deleted file mode 100644
index 21153d8a0..000000000
Binary files a/res/drawable-hdpi/ic_button_archive.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_close_clear_cancel.png b/res/drawable-hdpi/ic_button_close_clear_cancel.png
deleted file mode 100644
index c2df1505b..000000000
Binary files a/res/drawable-hdpi/ic_button_close_clear_cancel.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_delete.png b/res/drawable-hdpi/ic_button_delete.png
deleted file mode 100644
index d135c102e..000000000
Binary files a/res/drawable-hdpi/ic_button_delete.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_flag.png b/res/drawable-hdpi/ic_button_flag.png
deleted file mode 100644
index 3b7e48fd2..000000000
Binary files a/res/drawable-hdpi/ic_button_flag.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_mark_read.png b/res/drawable-hdpi/ic_button_mark_read.png
deleted file mode 100644
index 3d18f1ea1..000000000
Binary files a/res/drawable-hdpi/ic_button_mark_read.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_mark_unread.png b/res/drawable-hdpi/ic_button_mark_unread.png
deleted file mode 100644
index e13b46227..000000000
Binary files a/res/drawable-hdpi/ic_button_mark_unread.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_move.png b/res/drawable-hdpi/ic_button_move.png
deleted file mode 100644
index 6bb42a537..000000000
Binary files a/res/drawable-hdpi/ic_button_move.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_unflag.png b/res/drawable-hdpi/ic_button_unflag.png
deleted file mode 100644
index de571b35e..000000000
Binary files a/res/drawable-hdpi/ic_button_unflag.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_account_list.png b/res/drawable-hdpi/ic_menu_account_list.png
deleted file mode 100644
index 3d01fb726..000000000
Binary files a/res/drawable-hdpi/ic_menu_account_list.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_batch.png b/res/drawable-hdpi/ic_menu_batch.png
deleted file mode 100644
index 5c6938369..000000000
Binary files a/res/drawable-hdpi/ic_menu_batch.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_compose.png b/res/drawable-hdpi/ic_menu_compose.png
deleted file mode 100644
index 68e358521..000000000
Binary files a/res/drawable-hdpi/ic_menu_compose.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_edit.png b/res/drawable-hdpi/ic_menu_edit.png
deleted file mode 100644
index 84d75debd..000000000
Binary files a/res/drawable-hdpi/ic_menu_edit.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_forward_mail.png b/res/drawable-hdpi/ic_menu_forward_mail.png
deleted file mode 100644
index 0e6e2311d..000000000
Binary files a/res/drawable-hdpi/ic_menu_forward_mail.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_inbox.png b/res/drawable-hdpi/ic_menu_inbox.png
deleted file mode 100644
index d399a03f0..000000000
Binary files a/res/drawable-hdpi/ic_menu_inbox.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_mark.png b/res/drawable-hdpi/ic_menu_mark.png
deleted file mode 100644
index 3d9daf4c8..000000000
Binary files a/res/drawable-hdpi/ic_menu_mark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_move.png b/res/drawable-hdpi/ic_menu_move.png
deleted file mode 100644
index f10fb1fcc..000000000
Binary files a/res/drawable-hdpi/ic_menu_move.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_navigate.png b/res/drawable-hdpi/ic_menu_navigate.png
deleted file mode 100644
index ad9baf64d..000000000
Binary files a/res/drawable-hdpi/ic_menu_navigate.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_reply.png b/res/drawable-hdpi/ic_menu_reply.png
deleted file mode 100644
index 0f6bd0c7a..000000000
Binary files a/res/drawable-hdpi/ic_menu_reply.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_reply_all.png b/res/drawable-hdpi/ic_menu_reply_all.png
deleted file mode 100644
index fc1ff4a89..000000000
Binary files a/res/drawable-hdpi/ic_menu_reply_all.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_search.png b/res/drawable-hdpi/ic_menu_search.png
deleted file mode 100644
index 566637364..000000000
Binary files a/res/drawable-hdpi/ic_menu_search.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_send.png b/res/drawable-hdpi/ic_menu_send.png
deleted file mode 100644
index 98811379e..000000000
Binary files a/res/drawable-hdpi/ic_menu_send.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_set_sort.png b/res/drawable-hdpi/ic_menu_set_sort.png
deleted file mode 100644
index 5a70cb97b..000000000
Binary files a/res/drawable-hdpi/ic_menu_set_sort.png and /dev/null differ
diff --git a/res/drawable-ldpi/ic_action_toggle_flag_dark.png b/res/drawable-ldpi/ic_action_toggle_flag_dark.png
deleted file mode 100644
index e9ac07d08..000000000
Binary files a/res/drawable-ldpi/ic_action_toggle_flag_dark.png and /dev/null differ
diff --git a/res/drawable-ldpi/ic_action_toggle_flag_light.png b/res/drawable-ldpi/ic_action_toggle_flag_light.png
deleted file mode 100644
index 529815d10..000000000
Binary files a/res/drawable-ldpi/ic_action_toggle_flag_light.png and /dev/null differ
diff --git a/res/drawable-ldpi/ic_action_toggle_read_dark.png b/res/drawable-ldpi/ic_action_toggle_read_dark.png
deleted file mode 100644
index b56dcc5a7..000000000
Binary files a/res/drawable-ldpi/ic_action_toggle_read_dark.png and /dev/null differ
diff --git a/res/drawable-ldpi/ic_action_toggle_read_light.png b/res/drawable-ldpi/ic_action_toggle_read_light.png
deleted file mode 100644
index 4de40d45b..000000000
Binary files a/res/drawable-ldpi/ic_action_toggle_read_light.png and /dev/null differ
diff --git a/res/drawable/attached_image_placeholder.png b/res/drawable-mdpi/attached_image_placeholder.png
similarity index 100%
rename from res/drawable/attached_image_placeholder.png
rename to res/drawable-mdpi/attached_image_placeholder.png
diff --git a/res/drawable/attachment_text_box_dark.9.png b/res/drawable-mdpi/attachment_text_box_dark.9.png
similarity index 100%
rename from res/drawable/attachment_text_box_dark.9.png
rename to res/drawable-mdpi/attachment_text_box_dark.9.png
diff --git a/res/drawable/attachment_text_box_light.9.png b/res/drawable-mdpi/attachment_text_box_light.9.png
similarity index 100%
rename from res/drawable/attachment_text_box_light.9.png
rename to res/drawable-mdpi/attachment_text_box_light.9.png
diff --git a/res/drawable/btn_dialog_disable.png b/res/drawable-mdpi/btn_dialog_disable.png
similarity index 100%
rename from res/drawable/btn_dialog_disable.png
rename to res/drawable-mdpi/btn_dialog_disable.png
diff --git a/res/drawable/btn_dialog_normal.png b/res/drawable-mdpi/btn_dialog_normal.png
similarity index 100%
rename from res/drawable/btn_dialog_normal.png
rename to res/drawable-mdpi/btn_dialog_normal.png
diff --git a/res/drawable/btn_dialog_pressed.png b/res/drawable-mdpi/btn_dialog_pressed.png
similarity index 100%
rename from res/drawable/btn_dialog_pressed.png
rename to res/drawable-mdpi/btn_dialog_pressed.png
diff --git a/res/drawable/btn_dialog_selected.png b/res/drawable-mdpi/btn_dialog_selected.png
similarity index 100%
rename from res/drawable/btn_dialog_selected.png
rename to res/drawable-mdpi/btn_dialog_selected.png
diff --git a/res/drawable/btn_edit_disable.png b/res/drawable-mdpi/btn_edit_disable.png
similarity index 100%
rename from res/drawable/btn_edit_disable.png
rename to res/drawable-mdpi/btn_edit_disable.png
diff --git a/res/drawable/btn_edit_normal.png b/res/drawable-mdpi/btn_edit_normal.png
similarity index 100%
rename from res/drawable/btn_edit_normal.png
rename to res/drawable-mdpi/btn_edit_normal.png
diff --git a/res/drawable/btn_edit_pressed.png b/res/drawable-mdpi/btn_edit_pressed.png
similarity index 100%
rename from res/drawable/btn_edit_pressed.png
rename to res/drawable-mdpi/btn_edit_pressed.png
diff --git a/res/drawable/btn_edit_selected.png b/res/drawable-mdpi/btn_edit_selected.png
similarity index 100%
rename from res/drawable/btn_edit_selected.png
rename to res/drawable-mdpi/btn_edit_selected.png
diff --git a/res/drawable/btn_star_big_buttonless_off.png b/res/drawable-mdpi/btn_star_big_buttonless_off.png
similarity index 100%
rename from res/drawable/btn_star_big_buttonless_off.png
rename to res/drawable-mdpi/btn_star_big_buttonless_off.png
diff --git a/res/drawable/btn_star_big_buttonless_on.png b/res/drawable-mdpi/btn_star_big_buttonless_on.png
similarity index 100%
rename from res/drawable/btn_star_big_buttonless_on.png
rename to res/drawable-mdpi/btn_star_big_buttonless_on.png
diff --git a/res/drawable/button_indicator_next.png b/res/drawable-mdpi/button_indicator_next.png
similarity index 100%
rename from res/drawable/button_indicator_next.png
rename to res/drawable-mdpi/button_indicator_next.png
diff --git a/res/drawable/button_indicator_prev.png b/res/drawable-mdpi/button_indicator_prev.png
similarity index 100%
rename from res/drawable/button_indicator_prev.png
rename to res/drawable-mdpi/button_indicator_prev.png
diff --git a/res/drawable-mdpi/divider_dark.9.png b/res/drawable-mdpi/divider_dark.9.png
deleted file mode 100644
index 986ab0b97..000000000
Binary files a/res/drawable-mdpi/divider_dark.9.png and /dev/null differ
diff --git a/res/drawable/divider_horizontal_email.9.png b/res/drawable-mdpi/divider_horizontal_email.9.png
similarity index 100%
rename from res/drawable/divider_horizontal_email.9.png
rename to res/drawable-mdpi/divider_horizontal_email.9.png
diff --git a/res/drawable-mdpi/divider_light.9.png b/res/drawable-mdpi/divider_light.9.png
deleted file mode 100644
index 0279e17a1..000000000
Binary files a/res/drawable-mdpi/divider_light.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_toggle_flag_dark.png b/res/drawable-mdpi/ic_action_toggle_flag_dark.png
deleted file mode 100755
index dd634a743..000000000
Binary files a/res/drawable-mdpi/ic_action_toggle_flag_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_toggle_flag_light.png b/res/drawable-mdpi/ic_action_toggle_flag_light.png
deleted file mode 100644
index 3c8cea965..000000000
Binary files a/res/drawable-mdpi/ic_action_toggle_flag_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_toggle_read_dark.png b/res/drawable-mdpi/ic_action_toggle_read_dark.png
deleted file mode 100644
index 038e35df1..000000000
Binary files a/res/drawable-mdpi/ic_action_toggle_read_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_toggle_read_light.png b/res/drawable-mdpi/ic_action_toggle_read_light.png
deleted file mode 100644
index 4f4b42671..000000000
Binary files a/res/drawable-mdpi/ic_action_toggle_read_light.png and /dev/null differ
diff --git a/res/drawable/ic_button_contacts.png b/res/drawable-mdpi/ic_button_contacts.png
similarity index 100%
rename from res/drawable/ic_button_contacts.png
rename to res/drawable-mdpi/ic_button_contacts.png
diff --git a/res/drawable/ic_delete.png b/res/drawable-mdpi/ic_delete.png
similarity index 100%
rename from res/drawable/ic_delete.png
rename to res/drawable-mdpi/ic_delete.png
diff --git a/res/drawable/ic_email_answered_small.png b/res/drawable-mdpi/ic_email_answered_small.png
similarity index 100%
rename from res/drawable/ic_email_answered_small.png
rename to res/drawable-mdpi/ic_email_answered_small.png
diff --git a/res/drawable/ic_email_attachment.png b/res/drawable-mdpi/ic_email_attachment.png
similarity index 100%
rename from res/drawable/ic_email_attachment.png
rename to res/drawable-mdpi/ic_email_attachment.png
diff --git a/res/drawable/ic_email_attachment_small.png b/res/drawable-mdpi/ic_email_attachment_small.png
similarity index 100%
rename from res/drawable/ic_email_attachment_small.png
rename to res/drawable-mdpi/ic_email_attachment_small.png
diff --git a/res/drawable/ic_email_forwarded_answered_small.png b/res/drawable-mdpi/ic_email_forwarded_answered_small.png
similarity index 100%
rename from res/drawable/ic_email_forwarded_answered_small.png
rename to res/drawable-mdpi/ic_email_forwarded_answered_small.png
diff --git a/res/drawable/ic_email_forwarded_small.png b/res/drawable-mdpi/ic_email_forwarded_small.png
similarity index 100%
rename from res/drawable/ic_email_forwarded_small.png
rename to res/drawable-mdpi/ic_email_forwarded_small.png
diff --git a/res/drawable/ic_menu_account_list.png b/res/drawable-mdpi/ic_menu_account_list.png
similarity index 100%
rename from res/drawable/ic_menu_account_list.png
rename to res/drawable-mdpi/ic_menu_account_list.png
diff --git a/res/drawable/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
similarity index 100%
rename from res/drawable/ic_menu_add.png
rename to res/drawable-mdpi/ic_menu_add.png
diff --git a/res/drawable/ic_menu_attachment.png b/res/drawable-mdpi/ic_menu_attachment.png
similarity index 100%
rename from res/drawable/ic_menu_attachment.png
rename to res/drawable-mdpi/ic_menu_attachment.png
diff --git a/res/drawable/ic_menu_cc.png b/res/drawable-mdpi/ic_menu_cc.png
similarity index 100%
rename from res/drawable/ic_menu_cc.png
rename to res/drawable-mdpi/ic_menu_cc.png
diff --git a/res/drawable/ic_menu_clear.png b/res/drawable-mdpi/ic_menu_clear.png
similarity index 100%
rename from res/drawable/ic_menu_clear.png
rename to res/drawable-mdpi/ic_menu_clear.png
diff --git a/res/drawable/ic_menu_close_clear_cancel.png b/res/drawable-mdpi/ic_menu_close_clear_cancel.png
similarity index 100%
rename from res/drawable/ic_menu_close_clear_cancel.png
rename to res/drawable-mdpi/ic_menu_close_clear_cancel.png
diff --git a/res/drawable/ic_menu_compact.png b/res/drawable-mdpi/ic_menu_compact.png
similarity index 100%
rename from res/drawable/ic_menu_compact.png
rename to res/drawable-mdpi/ic_menu_compact.png
diff --git a/res/drawable/ic_menu_delete.png b/res/drawable-mdpi/ic_menu_delete.png
similarity index 100%
rename from res/drawable/ic_menu_delete.png
rename to res/drawable-mdpi/ic_menu_delete.png
diff --git a/res/drawable/ic_menu_preferences.png b/res/drawable-mdpi/ic_menu_preferences.png
similarity index 100%
rename from res/drawable/ic_menu_preferences.png
rename to res/drawable-mdpi/ic_menu_preferences.png
diff --git a/res/drawable/ic_menu_refresh.png b/res/drawable-mdpi/ic_menu_refresh.png
similarity index 100%
rename from res/drawable/ic_menu_refresh.png
rename to res/drawable-mdpi/ic_menu_refresh.png
diff --git a/res/drawable/ic_menu_reply_receipt.png b/res/drawable-mdpi/ic_menu_reply_receipt.png
similarity index 100%
rename from res/drawable/ic_menu_reply_receipt.png
rename to res/drawable-mdpi/ic_menu_reply_receipt.png
diff --git a/res/drawable/ic_menu_save_draft.png b/res/drawable-mdpi/ic_menu_save_draft.png
similarity index 100%
rename from res/drawable/ic_menu_save_draft.png
rename to res/drawable-mdpi/ic_menu_save_draft.png
diff --git a/res/drawable/ic_menu_select_all.png b/res/drawable-mdpi/ic_menu_select_all.png
similarity index 100%
rename from res/drawable/ic_menu_select_all.png
rename to res/drawable-mdpi/ic_menu_select_all.png
diff --git a/res/drawable/ic_show_folders.png b/res/drawable-mdpi/ic_show_folders.png
similarity index 100%
rename from res/drawable/ic_show_folders.png
rename to res/drawable-mdpi/ic_show_folders.png
diff --git a/res/drawable/overlay_error.png b/res/drawable-mdpi/overlay_error.png
similarity index 100%
rename from res/drawable/overlay_error.png
rename to res/drawable-mdpi/overlay_error.png
diff --git a/res/drawable/overlay_ok.png b/res/drawable-mdpi/overlay_ok.png
similarity index 100%
rename from res/drawable/overlay_ok.png
rename to res/drawable-mdpi/overlay_ok.png
diff --git a/res/drawable/panel_separator.9.png b/res/drawable-mdpi/panel_separator.9.png
similarity index 100%
rename from res/drawable/panel_separator.9.png
rename to res/drawable-mdpi/panel_separator.9.png
diff --git a/res/drawable/popup_background.9.png b/res/drawable-mdpi/popup_background.9.png
similarity index 100%
rename from res/drawable/popup_background.9.png
rename to res/drawable-mdpi/popup_background.9.png
diff --git a/res/drawable/show_less.png b/res/drawable-mdpi/show_less.png
similarity index 100%
rename from res/drawable/show_less.png
rename to res/drawable-mdpi/show_less.png
diff --git a/res/drawable/show_more.png b/res/drawable-mdpi/show_more.png
similarity index 100%
rename from res/drawable/show_more.png
rename to res/drawable-mdpi/show_more.png
diff --git a/res/drawable/signed_large.png b/res/drawable-mdpi/signed_large.png
similarity index 100%
rename from res/drawable/signed_large.png
rename to res/drawable-mdpi/signed_large.png
diff --git a/res/drawable/stat_notify_email_generic.png b/res/drawable-mdpi/stat_notify_email_generic.png
similarity index 100%
rename from res/drawable/stat_notify_email_generic.png
rename to res/drawable-mdpi/stat_notify_email_generic.png
diff --git a/res/drawable-xhdpi/divider_dark.9.png b/res/drawable-xhdpi/divider_dark.9.png
deleted file mode 100644
index e62f011d4..000000000
Binary files a/res/drawable-xhdpi/divider_dark.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/divider_light.9.png b/res/drawable-xhdpi/divider_light.9.png
deleted file mode 100644
index 65061c0f4..000000000
Binary files a/res/drawable-xhdpi/divider_light.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_flag_dark.png b/res/drawable-xhdpi/ic_action_toggle_flag_dark.png
deleted file mode 100755
index 0c4ef1571..000000000
Binary files a/res/drawable-xhdpi/ic_action_toggle_flag_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_flag_light.png b/res/drawable-xhdpi/ic_action_toggle_flag_light.png
deleted file mode 100644
index 9ef985d53..000000000
Binary files a/res/drawable-xhdpi/ic_action_toggle_flag_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_read_dark.png b/res/drawable-xhdpi/ic_action_toggle_read_dark.png
deleted file mode 100644
index 46f0896bb..000000000
Binary files a/res/drawable-xhdpi/ic_action_toggle_read_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_read_light.png b/res/drawable-xhdpi/ic_action_toggle_read_light.png
deleted file mode 100644
index 4cd651b26..000000000
Binary files a/res/drawable-xhdpi/ic_action_toggle_read_light.png and /dev/null differ
diff --git a/res/drawable/btn_check_buttonless_off.png b/res/drawable/btn_check_buttonless_off.png
deleted file mode 100644
index 73e292cd6..000000000
Binary files a/res/drawable/btn_check_buttonless_off.png and /dev/null differ
diff --git a/res/drawable/btn_check_buttonless_on.png b/res/drawable/btn_check_buttonless_on.png
deleted file mode 100644
index 5bfd125b2..000000000
Binary files a/res/drawable/btn_check_buttonless_on.png and /dev/null differ
diff --git a/res/drawable/btn_check_small_off.png b/res/drawable/btn_check_small_off.png
deleted file mode 100644
index 92dd13670..000000000
Binary files a/res/drawable/btn_check_small_off.png and /dev/null differ
diff --git a/res/drawable/btn_check_small_on.png b/res/drawable/btn_check_small_on.png
deleted file mode 100644
index 5723cf5cc..000000000
Binary files a/res/drawable/btn_check_small_on.png and /dev/null differ
diff --git a/res/drawable/checkbox.xml b/res/drawable/checkbox.xml
deleted file mode 100644
index eecda8fa4..000000000
--- a/res/drawable/checkbox.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:state_checked="false"
-         android:drawable="@drawable/btn_check_buttonless_off" />
-
-     <item android:state_checked="true"
-         android:drawable="@drawable/btn_check_buttonless_on" />
-</selector>
diff --git a/res/drawable/checkbox_small.xml b/res/drawable/checkbox_small.xml
deleted file mode 100644
index 77e9bcb96..000000000
--- a/res/drawable/checkbox_small.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:state_checked="false"
-         android:drawable="@drawable/btn_check_small_off" />
-
-     <item android:state_checked="true"
-         android:drawable="@drawable/btn_check_small_on" />
-</selector>
diff --git a/res/drawable/colorpicker_arrow.png b/res/drawable/colorpicker_arrow.png
deleted file mode 100644
index 876295f74..000000000
Binary files a/res/drawable/colorpicker_arrow.png and /dev/null differ
diff --git a/res/drawable/colorpicker_hue.png b/res/drawable/colorpicker_hue.png
deleted file mode 100644
index 09d28397f..000000000
Binary files a/res/drawable/colorpicker_hue.png and /dev/null differ
diff --git a/res/drawable/colorpicker_menjadi.png b/res/drawable/colorpicker_menjadi.png
deleted file mode 100644
index 2cec684f3..000000000
Binary files a/res/drawable/colorpicker_menjadi.png and /dev/null differ
diff --git a/res/drawable/colorpicker_spyglass.png b/res/drawable/colorpicker_spyglass.png
deleted file mode 100644
index 746e1c58b..000000000
Binary files a/res/drawable/colorpicker_spyglass.png and /dev/null differ
diff --git a/res/drawable/envelope.png b/res/drawable/envelope.png
deleted file mode 100644
index d3846347f..000000000
Binary files a/res/drawable/envelope.png and /dev/null differ
diff --git a/res/drawable/ic_button_archive.png b/res/drawable/ic_button_archive.png
deleted file mode 100644
index ec63c8763..000000000
Binary files a/res/drawable/ic_button_archive.png and /dev/null differ
diff --git a/res/drawable/ic_button_close_clear_cancel.png b/res/drawable/ic_button_close_clear_cancel.png
deleted file mode 100644
index a3f658c55..000000000
Binary files a/res/drawable/ic_button_close_clear_cancel.png and /dev/null differ
diff --git a/res/drawable/ic_button_delete.png b/res/drawable/ic_button_delete.png
deleted file mode 100644
index eca7f03ac..000000000
Binary files a/res/drawable/ic_button_delete.png and /dev/null differ
diff --git a/res/drawable/ic_button_flag.png b/res/drawable/ic_button_flag.png
deleted file mode 100644
index 1f31cfb57..000000000
Binary files a/res/drawable/ic_button_flag.png and /dev/null differ
diff --git a/res/drawable/ic_button_mark_read.png b/res/drawable/ic_button_mark_read.png
deleted file mode 100644
index f4ab28734..000000000
Binary files a/res/drawable/ic_button_mark_read.png and /dev/null differ
diff --git a/res/drawable/ic_button_mark_unread.png b/res/drawable/ic_button_mark_unread.png
deleted file mode 100644
index b7ac299f8..000000000
Binary files a/res/drawable/ic_button_mark_unread.png and /dev/null differ
diff --git a/res/drawable/ic_button_move.png b/res/drawable/ic_button_move.png
deleted file mode 100644
index 419785cfc..000000000
Binary files a/res/drawable/ic_button_move.png and /dev/null differ
diff --git a/res/drawable/ic_button_unflag.png b/res/drawable/ic_button_unflag.png
deleted file mode 100644
index 5a55adf68..000000000
Binary files a/res/drawable/ic_button_unflag.png and /dev/null differ
diff --git a/res/drawable/ic_menu_batch.png b/res/drawable/ic_menu_batch.png
deleted file mode 100644
index 2f264af89..000000000
Binary files a/res/drawable/ic_menu_batch.png and /dev/null differ
diff --git a/res/drawable/ic_menu_compose.png b/res/drawable/ic_menu_compose.png
deleted file mode 100644
index 1b4733e42..000000000
Binary files a/res/drawable/ic_menu_compose.png and /dev/null differ
diff --git a/res/drawable/ic_menu_edit.png b/res/drawable/ic_menu_edit.png
deleted file mode 100644
index 41a9c2e20..000000000
Binary files a/res/drawable/ic_menu_edit.png and /dev/null differ
diff --git a/res/drawable/ic_menu_forward_mail.png b/res/drawable/ic_menu_forward_mail.png
deleted file mode 100644
index 97b63afeb..000000000
Binary files a/res/drawable/ic_menu_forward_mail.png and /dev/null differ
diff --git a/res/drawable/ic_menu_inbox.png b/res/drawable/ic_menu_inbox.png
deleted file mode 100644
index 9ab6f768d..000000000
Binary files a/res/drawable/ic_menu_inbox.png and /dev/null differ
diff --git a/res/drawable/ic_menu_mark.png b/res/drawable/ic_menu_mark.png
deleted file mode 100644
index 5e95da75a..000000000
Binary files a/res/drawable/ic_menu_mark.png and /dev/null differ
diff --git a/res/drawable/ic_menu_move.png b/res/drawable/ic_menu_move.png
deleted file mode 100644
index eea2bbdda..000000000
Binary files a/res/drawable/ic_menu_move.png and /dev/null differ
diff --git a/res/drawable/ic_menu_navigate.png b/res/drawable/ic_menu_navigate.png
deleted file mode 100644
index 4a9e42d86..000000000
Binary files a/res/drawable/ic_menu_navigate.png and /dev/null differ
diff --git a/res/drawable/ic_menu_reply.png b/res/drawable/ic_menu_reply.png
deleted file mode 100644
index bd18b582b..000000000
Binary files a/res/drawable/ic_menu_reply.png and /dev/null differ
diff --git a/res/drawable/ic_menu_reply_all.png b/res/drawable/ic_menu_reply_all.png
deleted file mode 100644
index 731e9971b..000000000
Binary files a/res/drawable/ic_menu_reply_all.png and /dev/null differ
diff --git a/res/drawable/ic_menu_search.png b/res/drawable/ic_menu_search.png
deleted file mode 100644
index 94446db97..000000000
Binary files a/res/drawable/ic_menu_search.png and /dev/null differ
diff --git a/res/drawable/ic_menu_send.png b/res/drawable/ic_menu_send.png
deleted file mode 100644
index 74c096dc9..000000000
Binary files a/res/drawable/ic_menu_send.png and /dev/null differ
diff --git a/res/drawable/ic_menu_set_sort.png b/res/drawable/ic_menu_set_sort.png
deleted file mode 100644
index 2ede2fa6c..000000000
Binary files a/res/drawable/ic_menu_set_sort.png and /dev/null differ
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
deleted file mode 100644
index 1a1aa6b32..000000000
Binary files a/res/drawable/icon.png and /dev/null differ
diff --git a/res/layout/colorpicker_chooser.xml b/res/layout/colorpicker_chooser.xml
deleted file mode 100644
index 32e2b4856..000000000
--- a/res/layout/colorpicker_chooser.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AbsoluteLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="296dp"
-	android:layout_height="256dp"
-	>
-
-	<!-- 
-	
-                    8 dp padding
-	8dp padding  | 240 dp box  | 14dp empty |  26dp hue | 8dp padding -> total 296
-                    8 dp padding
-					    v
-					  total 256
-	 -->
-	 
-	 
-	<com.fsck.k9.view.ColorPickerBox
-		android:id="@+id/colorpicker_viewBox"
-		android:layout_x="8dp"
-		android:layout_y="8dp"
-		android:layout_width="240dp"
-		android:layout_height="240dp" />
-
-	<ImageView
-		android:id="@+id/colorpicker_viewHue"
-		android:layout_x="262dp"
-		android:layout_y="8dp"
-		android:layout_width="26dp"
-		android:layout_height="240dp"
-		android:src="@drawable/colorpicker_hue"
-		android:scaleType="fitXY" />
-
-	<ImageView
-		android:id="@+id/colorpicker_arrow"
-		android:layout_x="252dp"
-		android:layout_y="4dp"
-		android:layout_width="8dp"
-		android:layout_height="9dp"
-		android:src="@drawable/colorpicker_arrow"
-		android:scaleType="matrix" />
-
-	<ImageView
-		android:id="@+id/colorpicker_spyglass"
-		android:layout_x="3dp"
-		android:layout_y="3dp"
-		android:layout_width="11dp"
-		android:layout_height="11dp"
-		android:src="@drawable/colorpicker_spyglass"
-		android:scaleType="matrix" />
-
-</AbsoluteLayout>
diff --git a/res/layout/colorpicker_dialog.xml b/res/layout/colorpicker_dialog.xml
deleted file mode 100644
index 3e2783987..000000000
--- a/res/layout/colorpicker_dialog.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:gravity="center_horizontal"
-	>
-
-	<include
-		android:layout_width="296dp"
-		android:layout_height="256dp"
-		android:id="@+id/colorpicker_includeChooser"
-		layout="@layout/colorpicker_chooser" />
-
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:gravity="center_horizontal"
-		android:paddingTop="8dp"
-		android:paddingBottom="8dp"
-		>
-	
-		<AbsoluteLayout
-			android:layout_width="200dp"
-			android:layout_height="40dp"
-		>
-		
-			<View
-				android:layout_width="80dp"
-				android:layout_height="40dp"
-				android:layout_x="0dp"
-				android:layout_y="0dp"
-				android:id="@+id/colorpicker_colorOld"
-				android:background="#faa"
-			/>
-			
-			<ImageView
-				android:layout_width="40dp"
-				android:layout_height="40dp"
-				android:layout_x="80dp"
-				android:layout_y="0dp"
-				android:src="@drawable/colorpicker_menjadi"
-			/>
-			
-			
-			<View
-				android:layout_width="80dp"
-				android:layout_height="40dp"
-				android:layout_x="120dp"
-				android:layout_y="0dp"
-				android:id="@+id/colorpicker_colorNew"
-				android:background="#aaf"
-			/>
-			
-		</AbsoluteLayout>
-			
-	</LinearLayout>
-</LinearLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 59e5224d3..8753943ca 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -3,7 +3,6 @@
 
     <declare-styleable name="K9Styles">
         <attr name="iconFolder" format="reference" />
-        <attr name="listDivider" format="reference" />
         <attr name="iconListItemMenu" format="reference" />
         <attr name="iconMenuInfoDetails" format="reference" />
         <attr name="iconActionAddAttachment" format="reference" />
@@ -33,12 +32,10 @@
         <attr name="iconMenuCloseClearCancel" format="reference" />
         <attr name="iconMenuCompact" format="reference" />
         <attr name="iconMenuDelete" format="reference" />
-        <attr name="iconMenuInbox" format="reference" />
         <attr name="iconMenuPreferences" format="reference" />
         <attr name="iconMenuRefresh" format="reference" />
         <attr name="iconMenuReplyReceipt" format="reference" />
         <attr name="iconMenuSaveDraft" format="reference" />
-        <attr name="iconMenuSearch" format="reference" />
         <attr name="iconMenuSelectAll" format="reference" />
         <attr name="iconMenuShowFolders" format="reference" />
         <attr name="textColorPrimaryRecipientDropdown" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d25ae1021..84951adba 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -3,7 +3,6 @@
 
     <style name="Theme.K9.Light.Base" parent="Theme.Sherlock.Light">
         <item name="iconFolder">@drawable/folder_light</item>
-        <item name="listDivider">@drawable/divider_light</item>
         <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_light</item>
         <item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
         <item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_light</item>
@@ -33,12 +32,10 @@
         <item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
         <item name="iconMenuCompact">@drawable/ic_menu_compact</item>
         <item name="iconMenuDelete">@drawable/ic_menu_delete</item>
-        <item name="iconMenuInbox">@drawable/ic_menu_inbox</item>
         <item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
         <item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
         <item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
         <item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
-        <item name="iconMenuSearch">@drawable/ic_menu_search</item>
         <item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
         <item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
@@ -57,7 +54,6 @@
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
         <item name="android:windowBackground">@android:color/black</item>
         <item name="iconFolder">@drawable/folder_dark</item>
-        <item name="listDivider">@drawable/divider_dark</item>
         <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_dark</item>
         <item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
         <item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_dark</item>
@@ -87,12 +83,10 @@
         <item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
         <item name="iconMenuCompact">@drawable/ic_menu_compact</item>
         <item name="iconMenuDelete">@drawable/ic_menu_delete</item>
-        <item name="iconMenuInbox">@drawable/ic_menu_inbox</item>
         <item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
         <item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
         <item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
         <item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
-        <item name="iconMenuSearch">@drawable/ic_menu_search</item>
         <item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
         <item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_dark</item>