diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 06f69caf83d4352f6d06a794bc4f609677a58868..c290d6bd45c7b6c8d5ce0b5c0b8736f6879fda08 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 97640355484b5f5f8ad1e6a0a7b3e10fb8a10fe5..0000000000000000000000000000000000000000
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 9d88d0f48c646d455bcf45a5668d3e52ce182de6..0000000000000000000000000000000000000000
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 60f9f100b211e645299a232aab2ec85eecf0e39a..0000000000000000000000000000000000000000
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 e206f296c2535b11a2243ae93a31b2957f42ab7d..0000000000000000000000000000000000000000
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 22327391e9d1820b2dedfe3df093c1bcf581e153..0000000000000000000000000000000000000000
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 f97df1d51e42e97e1c289984f0c20f76da0f9cfc..0000000000000000000000000000000000000000
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 703b31f8027859b5810937a5c2da2b97428c68ed..0000000000000000000000000000000000000000
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 58bf972171f199c359dcdb3bc6233ac84c7853d3..0000000000000000000000000000000000000000
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 9fc6455ae11e3f84af8fa9287fbfbd840556ecbe..0000000000000000000000000000000000000000
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 756db316e07cb4d6f04db480697de524d0bd1034..0000000000000000000000000000000000000000
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 5f7c6eff38c2a503c1cfc2c4794850ad2c06d23f..0000000000000000000000000000000000000000
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 3e7f16d516c4f75b161f9daf49beb0ea7e0f3a65..0000000000000000000000000000000000000000
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 d866d6160db2dade92436e92401864bf79ab37f9..0000000000000000000000000000000000000000
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 c01c2b3822af20897f596c907282761e7e8a085f..0000000000000000000000000000000000000000
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 2c917615ffda776323ab2a0ee2c4350cc7163747..0000000000000000000000000000000000000000
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 45b22282fc9a8955714ccc581926615b21ab9f8a..0000000000000000000000000000000000000000
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 dae27903e9ba3415808d48e6ac20afd6de64907b..0000000000000000000000000000000000000000
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 58a56e457b0bc39aade617acddcf52b501d495e7..0000000000000000000000000000000000000000
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 e206f296c2535b11a2243ae93a31b2957f42ab7d..0000000000000000000000000000000000000000
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 772e3598edb5441a68bb184f9c85e17109ebd6ee..0000000000000000000000000000000000000000
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 4439d1aecdff690a389e5b19921b0bd78b0ab784..0000000000000000000000000000000000000000
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 0eb78f7c7341b7a4e8f2fa63bb42068ab72b1ae7..0000000000000000000000000000000000000000
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 54eecded35495a5d6e6bf2ea5f68003aec682bd0..0000000000000000000000000000000000000000
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 a36464b8be84a614d4028bc961946d97dd034153..0000000000000000000000000000000000000000
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 b8f44c21ea9cd6ef5d9cc62acaf87ef8ee4a46f4..0000000000000000000000000000000000000000
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 5512dbd3061cfeb970bd17c37cd5f9d56da74922..0000000000000000000000000000000000000000
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 e5f1df225b64b19b7c33ef91c1e41f7fd9fa5005..0000000000000000000000000000000000000000
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 7cd46d63d760d8cd6bbb154e9b1191fb373aac23..0000000000000000000000000000000000000000
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 438ecdd883991826352dbe22f6fdabbfae455417..0000000000000000000000000000000000000000
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 4f18a95adf8415f5d584c98c626dab063d03f67e..0000000000000000000000000000000000000000
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 9a6558992221bd38d235800d7637f7cbce187e36..0000000000000000000000000000000000000000
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 b7d8f46a9773894f19219cc1b4adee0aaed0478e..0000000000000000000000000000000000000000
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 75d6b8c20e1bffb7a2ed39575868b3ee788e910d..0000000000000000000000000000000000000000
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 70e6d2d2a0e95eb311fe958b897f3a99391ab00f..0000000000000000000000000000000000000000
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 7134820209a2219c193c8e08a48c0e1a52aa3368..0000000000000000000000000000000000000000
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 d846e72c612f6d3b9b0e3a77ed010bce6e159efd..0000000000000000000000000000000000000000
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 248fb09cd0c918955323e790c4c3250997c99819..0000000000000000000000000000000000000000
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 cf5fab3adf243318d11ec95448c6deae3f52d9b1..0000000000000000000000000000000000000000
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 84b43d34c3b365925e4c46230e8b791e4db9abbd..0000000000000000000000000000000000000000
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 68a453209e38499051d1d68d06b743116caf7074..0000000000000000000000000000000000000000
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 650b4d8993a6590ec68b789441206638ad6a5b35..0000000000000000000000000000000000000000
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 1ee3cccddda7f18aac033903263c9f728ef301f9..0000000000000000000000000000000000000000
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 f17e7980ee9aee545cb23bf93e9b21613278514c..0000000000000000000000000000000000000000
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 1d265aac640c1150acfee6c0c4162002c6de093f..0000000000000000000000000000000000000000
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 faffa233741ad0130ddf76b5acf8c0c5282ae0ac..0000000000000000000000000000000000000000
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 de008e51a306771d6820dcd24871bb30360e1525..0000000000000000000000000000000000000000
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 94ab6f4c5dd8f3a082b2a84d6e08f2564a589d94..0000000000000000000000000000000000000000
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 342a79de6b7d3f18a7dbf7b97b6c8944e37d575a..0000000000000000000000000000000000000000
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 70e6d2d2a0e95eb311fe958b897f3a99391ab00f..0000000000000000000000000000000000000000
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 4edb1ff92fe4c88a984a299ae6ff643cb6e0cbf2..0000000000000000000000000000000000000000
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 05332ebfa7e867bfde5f59d5d0456ae0d4eb4afc..0000000000000000000000000000000000000000
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 c290e5902fd96e62a0a15c6a88d90c5d261b64b2..0000000000000000000000000000000000000000
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 25c36db42c6128d7038fc7c684b299be7c66dee2..0000000000000000000000000000000000000000
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 7362f0d7b0feeaf36ad4fe0c3786318dff2c3bfe..0000000000000000000000000000000000000000
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 09d42dc825e200ea22f36db829bba4373ffe318c..0000000000000000000000000000000000000000
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 20af01deafc19358befadd156b979db92945d2da..0000000000000000000000000000000000000000
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 13a878bed6bfe7407ea56840518fc04cc9cc05cf..0000000000000000000000000000000000000000
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 ad2dbae95ffb85c48def73f87395fe42698832f3..0000000000000000000000000000000000000000
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 dfff5ac877bcd3529895bffcd69cc82272ee6985..0000000000000000000000000000000000000000
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 4365d1780fb9e03b58dc826697ad0d85db9ba097..0000000000000000000000000000000000000000
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 c493aa5a46324be03003a85c99371076cdb92c38..0000000000000000000000000000000000000000
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 4e8de1b6174932146a6ed7dbdbf366c059f0682e..0000000000000000000000000000000000000000
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 31b4b221d811f6685c3ebe99be2849bbcccc4d51..0000000000000000000000000000000000000000
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 d1634205dfec57c9ce660a6bd6e9338c4a4a7b86..0000000000000000000000000000000000000000
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 5ddf15139b80b2996782448b3453268197a0cb48..0000000000000000000000000000000000000000
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 a6e1aa290b94f5516dc596ec2d0186450ea99a5c..0000000000000000000000000000000000000000
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 9eeeed124dbc2e6c32b179a48cb449bec2b2aeb2..0000000000000000000000000000000000000000
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 b8915716e06792d926f397a7b17346f656c86aa1..0000000000000000000000000000000000000000
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 702ad476c581de01b5b27caf175da3a9214a4a71..0000000000000000000000000000000000000000
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 67e056fef01235120a1f3b94e0d6f548b741b258..0000000000000000000000000000000000000000
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 8ab436d8746d96fa4e003d3b516bfc3d4960df4c..0000000000000000000000000000000000000000
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 fa2af49744b978c535cc59a972fc77b0a16afe4f..0000000000000000000000000000000000000000
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 dde2141f214815395f40f35b479d4443135f6898..0000000000000000000000000000000000000000
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 41cbab203c21ff1c4dab07b2a4848800576b0b03..0000000000000000000000000000000000000000
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 c0902a03e89e77b3974e24bea99e80bd9ef781c0..0000000000000000000000000000000000000000
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 cdc160d4c6210f179e79553093ebb2547f0330a5..0000000000000000000000000000000000000000
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 ab4ab9da697b8c68c0c7ba498dc3bb3dc3da9c2b..0000000000000000000000000000000000000000
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 58e2e3b4d86d43293595bfbcdf7aa14d462d7dfd..0000000000000000000000000000000000000000
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 d1634205dfec57c9ce660a6bd6e9338c4a4a7b86..0000000000000000000000000000000000000000
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 19658e4a2acbe30df1aeb743ba5ac5e16a5edd21..0000000000000000000000000000000000000000
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 4e08b95adc68fcf00e8c4cb32668e4d50f62b442..0000000000000000000000000000000000000000
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 999d0f0d8c1571d3f90be129c8e4c95e895ee7b9..0000000000000000000000000000000000000000
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 425a8bc8dce5daa8c5f4f78b0b7052805a66e950..0000000000000000000000000000000000000000
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 40771e480181cbf5144668d273b6b3dd4bc7d1dd..0000000000000000000000000000000000000000
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 34eb4ec00f747941cb51cd59deead243a0f4305c..0000000000000000000000000000000000000000
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 3155ef699aeec5bdda8f4bbab48a8885e0f54edc..0000000000000000000000000000000000000000
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 5c2440e4a8c32686d9ae57d80b58eb21ab24eaa1..0000000000000000000000000000000000000000
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 e9ab742e8c44b5ff24c73383f3093cb3b159db57..0000000000000000000000000000000000000000
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 42a2191eef3295a7aa89d3de8b07bc62eada0adf..0000000000000000000000000000000000000000
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 a5a2c25efd72107bfbf82cf58e663faf6a43d8c8..0000000000000000000000000000000000000000
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 2b46dbb9aeca4b9b3d01e4f2b2b433a065444c46..0000000000000000000000000000000000000000
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 e9a58eafc2870f380492f6bb1f1928a32bbbf9d3..0000000000000000000000000000000000000000
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 e7b9910235d905d19e0493589df65e19e6991785..0000000000000000000000000000000000000000
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 5dc214356fa92bfe1ed3809118ede20f6f853656..0000000000000000000000000000000000000000
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 a0508df8c408c743e6933b6d5d581c289e89495a..0000000000000000000000000000000000000000
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 a381cdc3fd657126d2e0424d08ed32d628d1a6a6..0000000000000000000000000000000000000000
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 cb1260a4c68d931cb7dbe80341355c1c2438bd9a..0000000000000000000000000000000000000000
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 6bcd83134a01ad5b656d02facc08024500e96849..0000000000000000000000000000000000000000
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 3a241ea411c3949f872f421ea7efd2841fa3a594..0000000000000000000000000000000000000000
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 f2b2078b0787cf6f5722033b5b794cb5fdcba000..0000000000000000000000000000000000000000
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 9289b1c8f26cae59fc1166a1f2e71f54dd15ebc0..0000000000000000000000000000000000000000
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 c42c2bfb58ae772ea54d1f1b7a74a94e2c8a2b2f..0000000000000000000000000000000000000000
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 ce7536cbdd755307df1806507498110477cd3d0d..0000000000000000000000000000000000000000
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 a186f1fb23fc42d175b275379a600ec391521a22..0000000000000000000000000000000000000000
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 cb847f3780ffe9c430bdd0e525ad2e48127b7b91..0000000000000000000000000000000000000000
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 44ee117ee91541ed71f27685dde0b03b51b89f7f..0000000000000000000000000000000000000000
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 331c545b8cb07a97ee63cb4f1256d1dba5557a82..0000000000000000000000000000000000000000
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 5dc214356fa92bfe1ed3809118ede20f6f853656..0000000000000000000000000000000000000000
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 a10863887e448e59e0eb34d7d08eb5f273498628..0000000000000000000000000000000000000000
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 ccf1fb00c5cb17a95340b24da169761318cc25cb..0000000000000000000000000000000000000000
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 530227e2d02e54f6434ad23c857249f2998f2369..0000000000000000000000000000000000000000
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 fe5fec471f17c23c4f274d2594361d5db6922869..0000000000000000000000000000000000000000
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 22ed428fc3d954710cc108d996a6eb3debadeea1..0000000000000000000000000000000000000000
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 e4439e7c9e7672433c3e4dbad339d5f7d73afbe1..0000000000000000000000000000000000000000
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 dd2ded8990e51731cbe5bc602366c6401ec5de44..0000000000000000000000000000000000000000
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 58c8a576f77670467cb487c18ee296b1c3f9caee..0000000000000000000000000000000000000000
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 566062f0d3eeb540aea2ecd6c0cbe3a58e4325e9..0000000000000000000000000000000000000000
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 432e68c4fc695e0d9506a4e0a67ae0ed0bc58dfd..0000000000000000000000000000000000000000
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 8dd01d5c2b4a9252c50822364d17ffccf72d55cb..0000000000000000000000000000000000000000
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 5598ee424aa739e7cd9be8cd1a5f243bc6167c45..0000000000000000000000000000000000000000
--- 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