diff --git a/app/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
index 1c0b9f5..b9ee232 100644
--- a/app/src/main/java/i2p/bote/android/EmailListActivity.java
+++ b/app/src/main/java/i2p/bote/android/EmailListActivity.java
@@ -107,7 +107,7 @@ public class EmailListActivity extends ActionBarActivity implements
 
         // Set up drawer toggle
         mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
-                R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close) {
+                R.drawable.ic_menu_white_24dp, R.string.drawer_open, R.string.drawer_close) {
             private boolean wasDragged = false;
 
             /** Called when a drawer has settled in a completely closed state. */
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_grey600_24dp.png
new file mode 100644
index 0000000..0ca6612
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_back_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_collections_collection.png b/app/src/main/res/drawable-hdpi/ic_collections_collection.png
deleted file mode 100644
index 6f441b4..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_collections_collection.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_content_discard.png b/app/src/main/res/drawable-hdpi/ic_content_discard.png
deleted file mode 100644
index ffd19d9..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_content_discard.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_content_edit.png b/app/src/main/res/drawable-hdpi/ic_content_edit.png
deleted file mode 100644
index 3eb5190..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_content_edit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_content_new_email.png b/app/src/main/res/drawable-hdpi/ic_content_new_email.png
deleted file mode 100644
index 3816f53..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_content_new_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_content_read.png b/app/src/main/res/drawable-hdpi/ic_content_read.png
deleted file mode 100644
index 9ef5295..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_content_read.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_content_save.png b/app/src/main/res/drawable-hdpi/ic_content_save.png
deleted file mode 100644
index 306d55a..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_content_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_content_unread.png b/app/src/main/res/drawable-hdpi/ic_content_unread.png
deleted file mode 100644
index d516f77..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_content_unread.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_create_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_create_white_24dp.png
new file mode 100644
index 0000000..730416c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_create_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..a9eac0c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_access_new_account.png b/app/src/main/res/drawable-hdpi/ic_device_access_new_account.png
deleted file mode 100644
index 593b163..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_access_new_account.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_access_not_secure.png b/app/src/main/res/drawable-hdpi/ic_device_access_not_secure.png
deleted file mode 100644
index 8aeccb4..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_access_not_secure.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_access_secure.png b/app/src/main/res/drawable-hdpi/ic_device_access_secure.png
deleted file mode 100644
index d5a86ca..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_device_access_secure.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_drafts_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_drafts_white_24dp.png
new file mode 100644
index 0000000..2739be2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_drafts_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index ff7b1de..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
new file mode 100644
index 0000000..9f5c756
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_forward_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..1a83870
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_forward_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png
new file mode 100644
index 0000000..1f58225
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
new file mode 100644
index 0000000..b94735e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_lock_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_markunread_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_markunread_white_24dp.png
new file mode 100644
index 0000000..f14c795
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_markunread_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..2e9f915
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_navigation_back.png b/app/src/main/res/drawable-hdpi/ic_navigation_back.png
deleted file mode 100644
index 837998f..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_navigation_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png
new file mode 100644
index 0000000..5334190
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_reply_all_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_reply_all_white_24dp.png
new file mode 100644
index 0000000..b06bfd4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_reply_all_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_reply_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000..fcf2096
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_reply_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000..8c9e9ce
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000..f7753d4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_social_add_person.png b/app/src/main/res/drawable-hdpi/ic_social_add_person.png
deleted file mode 100644
index d22a3ea..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_social_add_person.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_social_forward.png b/app/src/main/res/drawable-hdpi/ic_social_forward.png
deleted file mode 100644
index bed191d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_social_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_social_reply.png b/app/src/main/res/drawable-hdpi/ic_social_reply.png
deleted file mode 100644
index 835d96f..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_social_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_social_reply_all.png b/app/src/main/res/drawable-hdpi/ic_social_reply_all.png
deleted file mode 100644
index 7ee22a8..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_social_reply_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_social_send_now.png b/app/src/main/res/drawable-hdpi/ic_social_send_now.png
deleted file mode 100644
index 75e18b1..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_grey600_24dp.png
new file mode 100644
index 0000000..44e1c11
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_back_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_collections_collection.png b/app/src/main/res/drawable-mdpi/ic_collections_collection.png
deleted file mode 100644
index cc81e57..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_collections_collection.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_content_discard.png b/app/src/main/res/drawable-mdpi/ic_content_discard.png
deleted file mode 100644
index a8ee5f2..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_content_discard.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_content_edit.png b/app/src/main/res/drawable-mdpi/ic_content_edit.png
deleted file mode 100644
index 4a28d03..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_content_edit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_content_new_email.png b/app/src/main/res/drawable-mdpi/ic_content_new_email.png
deleted file mode 100644
index 2675a74..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_content_new_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_content_read.png b/app/src/main/res/drawable-mdpi/ic_content_read.png
deleted file mode 100644
index 0f59a03..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_content_read.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_content_save.png b/app/src/main/res/drawable-mdpi/ic_content_save.png
deleted file mode 100644
index ad07695..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_content_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_content_unread.png b/app/src/main/res/drawable-mdpi/ic_content_unread.png
deleted file mode 100644
index eff1ba3..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_content_unread.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_create_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_create_white_24dp.png
new file mode 100644
index 0000000..85cff0b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_create_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..e4ea52e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_access_new_account.png b/app/src/main/res/drawable-mdpi/ic_device_access_new_account.png
deleted file mode 100644
index aae6a95..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_access_new_account.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_access_not_secure.png b/app/src/main/res/drawable-mdpi/ic_device_access_not_secure.png
deleted file mode 100644
index 3493c0e..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_access_not_secure.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_access_secure.png b/app/src/main/res/drawable-mdpi/ic_device_access_secure.png
deleted file mode 100644
index b5b0815..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_device_access_secure.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_drafts_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_drafts_white_24dp.png
new file mode 100644
index 0000000..3cbbe39
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_drafts_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index fb681ba..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
new file mode 100644
index 0000000..1c5797c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_forward_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..b02c97f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_forward_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png
new file mode 100644
index 0000000..ab9efde
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
new file mode 100644
index 0000000..381b6a1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_lock_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_markunread_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_markunread_white_24dp.png
new file mode 100644
index 0000000..ac0858e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_markunread_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..42482eb
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_navigation_back.png b/app/src/main/res/drawable-mdpi/ic_navigation_back.png
deleted file mode 100644
index e6ba4a8..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_navigation_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png
new file mode 100644
index 0000000..d0857a4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_reply_all_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_reply_all_white_24dp.png
new file mode 100644
index 0000000..740b0a1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_reply_all_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_reply_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000..1637188
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_reply_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000..bb26bc0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000..b06f25b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_social_add_person.png b/app/src/main/res/drawable-mdpi/ic_social_add_person.png
deleted file mode 100644
index 9d24b73..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_social_add_person.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_social_forward.png b/app/src/main/res/drawable-mdpi/ic_social_forward.png
deleted file mode 100644
index d9f321f..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_social_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_social_reply.png b/app/src/main/res/drawable-mdpi/ic_social_reply.png
deleted file mode 100644
index 9e34465..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_social_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_social_reply_all.png b/app/src/main/res/drawable-mdpi/ic_social_reply_all.png
deleted file mode 100644
index 721ac9b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_social_reply_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_social_send_now.png b/app/src/main/res/drawable-mdpi/ic_social_send_now.png
deleted file mode 100644
index 382fdd4..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_grey600_24dp.png
new file mode 100644
index 0000000..acb9af9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_back_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_collections_collection.png b/app/src/main/res/drawable-xhdpi/ic_collections_collection.png
deleted file mode 100644
index 78500a9..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_collections_collection.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_content_discard.png b/app/src/main/res/drawable-xhdpi/ic_content_discard.png
deleted file mode 100644
index 412b333..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_content_discard.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_content_edit.png b/app/src/main/res/drawable-xhdpi/ic_content_edit.png
deleted file mode 100644
index 4215579..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_content_edit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_content_new_email.png b/app/src/main/res/drawable-xhdpi/ic_content_new_email.png
deleted file mode 100644
index 404b95a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_content_new_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_content_read.png b/app/src/main/res/drawable-xhdpi/ic_content_read.png
deleted file mode 100644
index 62e3d1a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_content_read.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_content_save.png b/app/src/main/res/drawable-xhdpi/ic_content_save.png
deleted file mode 100644
index 2720602..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_content_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_content_unread.png b/app/src/main/res/drawable-xhdpi/ic_content_unread.png
deleted file mode 100644
index 606c902..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_content_unread.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_create_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_create_white_24dp.png
new file mode 100644
index 0000000..7f0ea51
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_create_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..cdb230c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_access_new_account.png b/app/src/main/res/drawable-xhdpi/ic_device_access_new_account.png
deleted file mode 100644
index e61a09f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_access_new_account.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_access_not_secure.png b/app/src/main/res/drawable-xhdpi/ic_device_access_not_secure.png
deleted file mode 100644
index eb9539a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_access_not_secure.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_access_secure.png b/app/src/main/res/drawable-xhdpi/ic_device_access_secure.png
deleted file mode 100644
index d114121..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_device_access_secure.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_drafts_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_drafts_white_24dp.png
new file mode 100644
index 0000000..478e447
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_drafts_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index b9bc3d7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
new file mode 100644
index 0000000..e5f54ce
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_forward_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..432723c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_forward_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png
new file mode 100644
index 0000000..6e1321e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
new file mode 100644
index 0000000..c5e9d0b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_markunread_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_markunread_white_24dp.png
new file mode 100644
index 0000000..34aa246
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_markunread_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..ceadb18
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_navigation_back.png b/app/src/main/res/drawable-xhdpi/ic_navigation_back.png
deleted file mode 100644
index f420e43..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_navigation_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png
new file mode 100644
index 0000000..c402e8f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_reply_all_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_reply_all_white_24dp.png
new file mode 100644
index 0000000..c310496
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_reply_all_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000..8e66145
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_reply_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000..aa03320
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000..6e09313
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_social_add_person.png b/app/src/main/res/drawable-xhdpi/ic_social_add_person.png
deleted file mode 100644
index 08d874d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_social_add_person.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_social_forward.png b/app/src/main/res/drawable-xhdpi/ic_social_forward.png
deleted file mode 100644
index 340ce9a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_social_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_social_reply.png b/app/src/main/res/drawable-xhdpi/ic_social_reply.png
deleted file mode 100644
index 4cc854a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_social_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_social_reply_all.png b/app/src/main/res/drawable-xhdpi/ic_social_reply_all.png
deleted file mode 100644
index ea39a1c..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_social_reply_all.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_social_send_now.png b/app/src/main/res/drawable-xhdpi/ic_social_send_now.png
deleted file mode 100644
index bd37dc5..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_grey600_24dp.png
new file mode 100644
index 0000000..06104d8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png
new file mode 100644
index 0000000..34ec709
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_create_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..0e95e9b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drafts_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_drafts_white_24dp.png
new file mode 100644
index 0000000..9e342c9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_drafts_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
new file mode 100644
index 0000000..0d1ac48
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png
new file mode 100644
index 0000000..26294e5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png
new file mode 100644
index 0000000..b90a598
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
new file mode 100644
index 0000000..0dcada8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_markunread_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_markunread_white_24dp.png
new file mode 100644
index 0000000..0f733f9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_markunread_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..22c82ea
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png
new file mode 100644
index 0000000..074db2d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_reply_all_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_reply_all_white_24dp.png
new file mode 100644
index 0000000..b109030
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_reply_all_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000..0f11be4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_reply_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000..6c87e13
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000..cbb64e0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/layout-land/fragment_intro_0.xml b/app/src/main/res/layout-land/fragment_intro_0.xml
index 2dd3a55..5fcb2a0 100644
--- a/app/src/main/res/layout-land/fragment_intro_0.xml
+++ b/app/src/main/res/layout-land/fragment_intro_0.xml
@@ -68,7 +68,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:text="@string/swipe_to_start"
-        android:drawableLeft="@drawable/ic_navigation_back"
+        android:drawableLeft="@drawable/ic_arrow_back_grey600_24dp"
         android:gravity="center_vertical"
         android:layout_gravity="center_horizontal" />
 
diff --git a/app/src/main/res/layout/fragment_intro_0.xml b/app/src/main/res/layout/fragment_intro_0.xml
index e3cbd75..b5f5808 100644
--- a/app/src/main/res/layout/fragment_intro_0.xml
+++ b/app/src/main/res/layout/fragment_intro_0.xml
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:text="@string/swipe_to_start"
-        android:drawableLeft="@drawable/ic_navigation_back"
+        android:drawableLeft="@drawable/ic_arrow_back_grey600_24dp"
         android:gravity="center_vertical"
         android:layout_gravity="center_horizontal" />
 </LinearLayout>
diff --git a/app/src/main/res/menu/address_book_list.xml b/app/src/main/res/menu/address_book_list.xml
index 87b6b7d..b450a23 100644
--- a/app/src/main/res/menu/address_book_list.xml
+++ b/app/src/main/res/menu/address_book_list.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_new_contact"
-        android:icon="@drawable/ic_social_add_person"
+        android:icon="@drawable/ic_person_add_white_24dp"
         android:title="@string/action_new_contact"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/authenticated_list.xml b/app/src/main/res/menu/authenticated_list.xml
index 8a60c6e..4ba8489 100644
--- a/app/src/main/res/menu/authenticated_list.xml
+++ b/app/src/main/res/menu/authenticated_list.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_log_in"
-        android:icon="@drawable/ic_device_access_secure"
+        android:icon="@drawable/ic_lock_white_24dp"
         android:orderInCategory="1"
         android:title="@string/log_in"
         android:visible="false"
@@ -12,7 +12,7 @@
 
     <item
         android:id="@+id/action_log_out"
-        android:icon="@drawable/ic_device_access_not_secure"
+        android:icon="@drawable/ic_lock_open_white_24dp"
         android:orderInCategory="1"
         android:title="@string/log_out"
         android:visible="false"
diff --git a/app/src/main/res/menu/edit_contact.xml b/app/src/main/res/menu/edit_contact.xml
index 610c5fe..165f07e 100644
--- a/app/src/main/res/menu/edit_contact.xml
+++ b/app/src/main/res/menu/edit_contact.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_save_contact"
-        android:icon="@drawable/ic_content_save"
+        android:icon="@drawable/ic_save_white_24dp"
         android:title="@string/save_contact"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/edit_identity.xml b/app/src/main/res/menu/edit_identity.xml
index 7b5f2df..7bd8053 100644
--- a/app/src/main/res/menu/edit_identity.xml
+++ b/app/src/main/res/menu/edit_identity.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_save_identity"
-        android:icon="@drawable/ic_content_save"
+        android:icon="@drawable/ic_save_white_24dp"
         android:title="@string/save_identity"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/email_list.xml b/app/src/main/res/menu/email_list.xml
index 3beb58e..b24eadc 100644
--- a/app/src/main/res/menu/email_list.xml
+++ b/app/src/main/res/menu/email_list.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_new_email"
-        android:icon="@drawable/ic_content_new_email"
+        android:icon="@drawable/ic_create_white_24dp"
         android:title="@string/action_new_email"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/email_list_context.xml b/app/src/main/res/menu/email_list_context.xml
index 2d1c013..5948050 100644
--- a/app/src/main/res/menu/email_list_context.xml
+++ b/app/src/main/res/menu/email_list_context.xml
@@ -4,22 +4,22 @@
 
     <item
         android:id="@+id/action_delete"
-        android:icon="@drawable/ic_content_discard"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/action_delete"
         i2pandroid:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_mark_read"
-        android:icon="@drawable/ic_content_read"
+        android:icon="@drawable/ic_drafts_white_24dp"
         android:title="@string/action_mark_read"
         i2pandroid:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_mark_unread"
-        android:icon="@drawable/ic_content_unread"
+        android:icon="@drawable/ic_markunread_white_24dp"
         android:title="@string/action_mark_unread"
         i2pandroid:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_move_to"
-        android:icon="@drawable/ic_collections_collection"
+        android:icon="@drawable/ic_folder_white_24dp"
         android:title="@string/action_move_to"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/new_email.xml b/app/src/main/res/menu/new_email.xml
index a3e5cc8..5d06f72 100644
--- a/app/src/main/res/menu/new_email.xml
+++ b/app/src/main/res/menu/new_email.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_send_email"
-        android:icon="@drawable/ic_social_send_now"
+        android:icon="@drawable/ic_send_white_24dp"
         android:title="@string/action_send_email"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/set_password.xml b/app/src/main/res/menu/set_password.xml
index c6e9c6f..2703a22 100644
--- a/app/src/main/res/menu/set_password.xml
+++ b/app/src/main/res/menu/set_password.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_set_password"
-        android:icon="@drawable/ic_content_save"
+        android:icon="@drawable/ic_save_white_24dp"
         android:title="@string/pref_title_change_password"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/view_contact.xml b/app/src/main/res/menu/view_contact.xml
index d8fab5b..0b0b99e 100644
--- a/app/src/main/res/menu/view_contact.xml
+++ b/app/src/main/res/menu/view_contact.xml
@@ -10,7 +10,7 @@
 
     <item
         android:id="@+id/action_edit_contact"
-        android:icon="@drawable/ic_content_edit"
+        android:icon="@drawable/ic_create_white_24dp"
         android:title="@string/edit_contact"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/view_email.xml b/app/src/main/res/menu/view_email.xml
index 8ab8694..0a12dc0 100644
--- a/app/src/main/res/menu/view_email.xml
+++ b/app/src/main/res/menu/view_email.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/action_reply"
-        android:icon="@drawable/ic_social_reply"
+        android:icon="@drawable/ic_reply_white_24dp"
         android:title="@string/reply"
         i2pandroid:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_reply_all"
-        android:icon="@drawable/ic_social_reply_all"
+        android:icon="@drawable/ic_reply_all_white_24dp"
         android:title="@string/reply_all"
         i2pandroid:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_forward"
-        android:icon="@drawable/ic_social_forward"
+        android:icon="@drawable/ic_forward_white_24dp"
         android:title="@string/forward"
         i2pandroid:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/view_identity.xml b/app/src/main/res/menu/view_identity.xml
index 1347ed0..3881ad9 100644
--- a/app/src/main/res/menu/view_identity.xml
+++ b/app/src/main/res/menu/view_identity.xml
@@ -10,7 +10,7 @@
 
     <item
         android:id="@+id/action_edit_identity"
-        android:icon="@drawable/ic_content_edit"
+        android:icon="@drawable/ic_create_white_24dp"
         android:title="@string/edit_identity"
         i2pandroid:showAsAction="ifRoom"/>