diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 06f69caf8..c290d6bd4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -425,11 +425,7 @@ public class ConversationActivity extends XmppActivity
 			menuAdd.setVisible(!isConversationsOverviewHideable());
 			if (this.getSelectedConversation() != null) {
 				if (this.getSelectedConversation().getNextEncryption() != Message.ENCRYPTION_NONE) {
-					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-						menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
-					} else {
-						menuSecure.setIcon(R.drawable.ic_action_secure);
-					}
+					menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
 				}
 				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
 					menuContactDetails.setVisible(false);
diff --git a/src/main/res/drawable-hdpi/ic_action_add_group.png b/src/main/res/drawable-hdpi/ic_action_add_group.png
deleted file mode 100644
index 976403554..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_add_group.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_add_person.png b/src/main/res/drawable-hdpi/ic_action_add_person.png
deleted file mode 100644
index 9d88d0f48..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_add_person.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_camera.png b/src/main/res/drawable-hdpi/ic_action_camera.png
deleted file mode 100644
index 60f9f100b..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_camera.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_cancel.png b/src/main/res/drawable-hdpi/ic_action_cancel.png
deleted file mode 100644
index e206f296c..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_cancel.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_copy.png b/src/main/res/drawable-hdpi/ic_action_copy.png
deleted file mode 100644
index 22327391e..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_copy.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_copy_white.png b/src/main/res/drawable-hdpi/ic_action_copy_white.png
deleted file mode 100644
index f97df1d51..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_copy_white.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_discard.png b/src/main/res/drawable-hdpi/ic_action_discard.png
deleted file mode 100644
index 703b31f80..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_discard.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_done.png b/src/main/res/drawable-hdpi/ic_action_done.png
deleted file mode 100644
index 58bf97217..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_done.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_download.png b/src/main/res/drawable-hdpi/ic_action_download.png
deleted file mode 100644
index 9fc6455ae..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_download.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_edit.png b/src/main/res/drawable-hdpi/ic_action_edit.png
deleted file mode 100644
index 756db316e..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_edit.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/src/main/res/drawable-hdpi/ic_action_edit_dark.png
deleted file mode 100644
index 5f7c6eff3..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_group.png b/src/main/res/drawable-hdpi/ic_action_group.png
deleted file mode 100644
index 3e7f16d51..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_group.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_new.png b/src/main/res/drawable-hdpi/ic_action_new.png
deleted file mode 100644
index d866d6160..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_new.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_new_attachment.png b/src/main/res/drawable-hdpi/ic_action_new_attachment.png
deleted file mode 100644
index c01c2b382..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_new_attachment.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_not_secure.png b/src/main/res/drawable-hdpi/ic_action_not_secure.png
deleted file mode 100644
index 2c917615f..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_not_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh.png b/src/main/res/drawable-hdpi/ic_action_refresh.png
deleted file mode 100644
index 45b22282f..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_refresh.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh_white.png b/src/main/res/drawable-hdpi/ic_action_refresh_white.png
deleted file mode 100644
index dae27903e..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_refresh_white.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_remove.png b/src/main/res/drawable-hdpi/ic_action_remove.png
deleted file mode 100644
index 58a56e457..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_remove.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_remove_white.png b/src/main/res/drawable-hdpi/ic_action_remove_white.png
deleted file mode 100644
index e206f296c..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_remove_white.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_search.png b/src/main/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index 772e3598e..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_search.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_secure.png b/src/main/res/drawable-hdpi/ic_action_secure.png
deleted file mode 100644
index 4439d1aec..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/src/main/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100644
index 0eb78f7c7..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_settings.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_settings_white.png b/src/main/res/drawable-hdpi/ic_action_settings_white.png
deleted file mode 100644
index 54eecded3..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_settings_white.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_share.png b/src/main/res/drawable-hdpi/ic_action_share.png
deleted file mode 100644
index a36464b8b..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_share.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
deleted file mode 100644
index b8f44c21e..000000000
Binary files a/src/main/res/drawable-hdpi/tab_selected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 5512dbd30..000000000
Binary files a/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index e5f1df225..000000000
Binary files a/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
deleted file mode 100644
index 7cd46d63d..000000000
Binary files a/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 438ecdd88..000000000
Binary files a/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index 4f18a95ad..000000000
Binary files a/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_add_group.png b/src/main/res/drawable-mdpi/ic_action_add_group.png
deleted file mode 100644
index 9a6558992..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_add_group.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_add_person.png b/src/main/res/drawable-mdpi/ic_action_add_person.png
deleted file mode 100644
index b7d8f46a9..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_add_person.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_camera.png b/src/main/res/drawable-mdpi/ic_action_camera.png
deleted file mode 100644
index 75d6b8c20..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_camera.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_cancel.png b/src/main/res/drawable-mdpi/ic_action_cancel.png
deleted file mode 100644
index 70e6d2d2a..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_cancel.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_copy.png b/src/main/res/drawable-mdpi/ic_action_copy.png
deleted file mode 100644
index 713482020..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_copy.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_copy_white.png b/src/main/res/drawable-mdpi/ic_action_copy_white.png
deleted file mode 100644
index d846e72c6..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_copy_white.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_discard.png b/src/main/res/drawable-mdpi/ic_action_discard.png
deleted file mode 100644
index 248fb09cd..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_discard.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_done.png b/src/main/res/drawable-mdpi/ic_action_done.png
deleted file mode 100644
index cf5fab3ad..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_done.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_download.png b/src/main/res/drawable-mdpi/ic_action_download.png
deleted file mode 100644
index 84b43d34c..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_download.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_edit.png b/src/main/res/drawable-mdpi/ic_action_edit.png
deleted file mode 100644
index 68a453209..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_edit.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/src/main/res/drawable-mdpi/ic_action_edit_dark.png
deleted file mode 100644
index 650b4d899..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_group.png b/src/main/res/drawable-mdpi/ic_action_group.png
deleted file mode 100644
index 1ee3cccdd..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_group.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_new.png b/src/main/res/drawable-mdpi/ic_action_new.png
deleted file mode 100644
index f17e7980e..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_new.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_new_attachment.png b/src/main/res/drawable-mdpi/ic_action_new_attachment.png
deleted file mode 100644
index 1d265aac6..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_new_attachment.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_not_secure.png b/src/main/res/drawable-mdpi/ic_action_not_secure.png
deleted file mode 100644
index faffa2337..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_not_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_refresh.png b/src/main/res/drawable-mdpi/ic_action_refresh.png
deleted file mode 100644
index de008e51a..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_refresh.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_refresh_white.png b/src/main/res/drawable-mdpi/ic_action_refresh_white.png
deleted file mode 100644
index 94ab6f4c5..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_refresh_white.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_remove.png b/src/main/res/drawable-mdpi/ic_action_remove.png
deleted file mode 100644
index 342a79de6..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_remove.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_remove_white.png b/src/main/res/drawable-mdpi/ic_action_remove_white.png
deleted file mode 100644
index 70e6d2d2a..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_remove_white.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_search.png b/src/main/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index 4edb1ff92..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_search.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_secure.png b/src/main/res/drawable-mdpi/ic_action_secure.png
deleted file mode 100644
index 05332ebfa..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_settings.png b/src/main/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100644
index c290e5902..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_settings_white.png b/src/main/res/drawable-mdpi/ic_action_settings_white.png
deleted file mode 100644
index 25c36db42..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_settings_white.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_share.png b/src/main/res/drawable-mdpi/ic_action_share.png
deleted file mode 100644
index 7362f0d7b..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_share.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 09d42dc82..000000000
Binary files a/src/main/res/drawable-mdpi/tab_selected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 20af01dea..000000000
Binary files a/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index 13a878bed..000000000
Binary files a/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
deleted file mode 100644
index ad2dbae95..000000000
Binary files a/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index dfff5ac87..000000000
Binary files a/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index 4365d1780..000000000
Binary files a/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_add_group.png b/src/main/res/drawable-xhdpi/ic_action_add_group.png
deleted file mode 100644
index c493aa5a4..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_add_group.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_add_person.png b/src/main/res/drawable-xhdpi/ic_action_add_person.png
deleted file mode 100644
index 4e8de1b61..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_add_person.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_camera.png b/src/main/res/drawable-xhdpi/ic_action_camera.png
deleted file mode 100644
index 31b4b221d..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_camera.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_cancel.png b/src/main/res/drawable-xhdpi/ic_action_cancel.png
deleted file mode 100644
index d1634205d..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_cancel.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_copy.png b/src/main/res/drawable-xhdpi/ic_action_copy.png
deleted file mode 100644
index 5ddf15139..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_copy.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_copy_white.png b/src/main/res/drawable-xhdpi/ic_action_copy_white.png
deleted file mode 100644
index a6e1aa290..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_copy_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_discard.png b/src/main/res/drawable-xhdpi/ic_action_discard.png
deleted file mode 100644
index 9eeeed124..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_discard.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_done.png b/src/main/res/drawable-xhdpi/ic_action_done.png
deleted file mode 100644
index b8915716e..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_done.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_download.png b/src/main/res/drawable-xhdpi/ic_action_download.png
deleted file mode 100644
index 702ad476c..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_download.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_edit.png b/src/main/res/drawable-xhdpi/ic_action_edit.png
deleted file mode 100644
index 67e056fef..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_edit.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
deleted file mode 100644
index 8ab436d87..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_group.png b/src/main/res/drawable-xhdpi/ic_action_group.png
deleted file mode 100644
index fa2af4974..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_group.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_new.png b/src/main/res/drawable-xhdpi/ic_action_new.png
deleted file mode 100644
index dde2141f2..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_new.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
deleted file mode 100644
index 41cbab203..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_new_attachment.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/src/main/res/drawable-xhdpi/ic_action_not_secure.png
deleted file mode 100644
index c0902a03e..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_not_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh.png b/src/main/res/drawable-xhdpi/ic_action_refresh.png
deleted file mode 100644
index cdc160d4c..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xhdpi/ic_action_refresh_white.png
deleted file mode 100644
index ab4ab9da6..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_refresh_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_remove.png b/src/main/res/drawable-xhdpi/ic_action_remove.png
deleted file mode 100644
index 58e2e3b4d..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_remove.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_remove_white.png b/src/main/res/drawable-xhdpi/ic_action_remove_white.png
deleted file mode 100644
index d1634205d..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_remove_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_search.png b/src/main/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index 19658e4a2..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_search.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_secure.png b/src/main/res/drawable-xhdpi/ic_action_secure.png
deleted file mode 100644
index 4e08b95ad..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings.png b/src/main/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100644
index 999d0f0d8..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings_white.png b/src/main/res/drawable-xhdpi/ic_action_settings_white.png
deleted file mode 100644
index 425a8bc8d..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_settings_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_share.png b/src/main/res/drawable-xhdpi/ic_action_share.png
deleted file mode 100644
index 40771e480..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_share.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 34eb4ec00..000000000
Binary files a/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 3155ef699..000000000
Binary files a/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index 5c2440e4a..000000000
Binary files a/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
deleted file mode 100644
index e9ab742e8..000000000
Binary files a/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 42a2191ee..000000000
Binary files a/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index a5a2c25ef..000000000
Binary files a/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_add_group.png b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
deleted file mode 100644
index 2b46dbb9a..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_add_group.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
deleted file mode 100644
index e9a58eafc..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_add_person.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_camera.png b/src/main/res/drawable-xxhdpi/ic_action_camera.png
deleted file mode 100644
index e7b991023..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_camera.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/src/main/res/drawable-xxhdpi/ic_action_cancel.png
deleted file mode 100644
index 5dc214356..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_cancel.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_copy.png b/src/main/res/drawable-xxhdpi/ic_action_copy.png
deleted file mode 100644
index a0508df8c..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_copy.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_copy_white.png b/src/main/res/drawable-xxhdpi/ic_action_copy_white.png
deleted file mode 100644
index a381cdc3f..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_copy_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png
deleted file mode 100644
index cb1260a4c..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_discard.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_download.png b/src/main/res/drawable-xxhdpi/ic_action_download.png
deleted file mode 100644
index 6bcd83134..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_download.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_edit.png b/src/main/res/drawable-xxhdpi/ic_action_edit.png
deleted file mode 100644
index 3a241ea41..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_edit.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
deleted file mode 100644
index f2b2078b0..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_group.png b/src/main/res/drawable-xxhdpi/ic_action_group.png
deleted file mode 100644
index 9289b1c8f..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_group.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_new.png b/src/main/res/drawable-xxhdpi/ic_action_new.png
deleted file mode 100644
index c42c2bfb5..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_new.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
deleted file mode 100644
index ce7536cbd..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
deleted file mode 100644
index a186f1fb2..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_not_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
deleted file mode 100644
index cb847f378..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png
deleted file mode 100644
index 44ee117ee..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_remove.png b/src/main/res/drawable-xxhdpi/ic_action_remove.png
deleted file mode 100644
index 331c545b8..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_remove.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_remove_white.png b/src/main/res/drawable-xxhdpi/ic_action_remove_white.png
deleted file mode 100644
index 5dc214356..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_remove_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png
deleted file mode 100644
index a10863887..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_search.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png
deleted file mode 100644
index ccf1fb00c..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_secure.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/src/main/res/drawable-xxhdpi/ic_action_settings.png
deleted file mode 100644
index 530227e2d..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings_white.png b/src/main/res/drawable-xxhdpi/ic_action_settings_white.png
deleted file mode 100644
index fe5fec471..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_settings_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_share.png b/src/main/res/drawable-xxhdpi/ic_action_share.png
deleted file mode 100644
index 22ed428fc..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_share.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
deleted file mode 100644
index e4439e7c9..000000000
Binary files a/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index dd2ded899..000000000
Binary files a/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index 58c8a576f..000000000
Binary files a/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
deleted file mode 100644
index 566062f0d..000000000
Binary files a/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 432e68c4f..000000000
Binary files a/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index 8dd01d5c2..000000000
Binary files a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png and /dev/null differ
diff --git a/src/main/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml
deleted file mode 100644
index 5598ee424..000000000
--- a/src/main/res/drawable/actionbar_tab_indicator.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Non focused states -->
-    <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
-    <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
-    <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
-
-    <!-- Pressed -->
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
-    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
-    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
-
-</selector>
\ No newline at end of file