Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development

246 files changed, 42 insertions, 42 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
index 8723c7255..846acb9cb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -176,7 +176,7 @@ public abstract class DecryptFragment extends Fragment {
 
                     setSignatureLayoutVisibility(View.VISIBLE);
                     mSignatureAction.setText(R.string.decrypt_result_action_Lookup);
-                    mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_download, 0);
+                    mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_file_download_grey_24dp, 0);
                     mSignatureLayout.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
index afec3bf06..6f19d1de9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
@@ -136,7 +136,7 @@ public class SelectPublicKeyFragment extends ListFragmentWorkaround implements T
         mSearchView.setId(SEARCH_ID);
         mSearchView.setHint(R.string.menu_search);
         mSearchView.setCompoundDrawablesWithIntrinsicBounds(
-                getResources().getDrawable(R.drawable.ic_action_search), null, null, null);
+                getResources().getDrawable(R.drawable.ic_search_grey_24dp), null, null, null);
 
         linearLayout.addView(mSearchView, new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png
index 7cc407315..10c77d07d 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png
deleted file mode 100644
index 5ebac9706..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png
deleted file mode 100644
index cde36e1fa..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png
deleted file mode 100644
index 3daa64131..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collection.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collection.png
deleted file mode 100644
index 8de91173c..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collection.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_copy.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_copy.png
deleted file mode 100644
index 22327391e..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_copy.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png
deleted file mode 100644
index 9c717dd32..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png
deleted file mode 100644
index 58bf97217..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png
deleted file mode 100644
index 1f3d06519..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_edit.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_edit.png
deleted file mode 100644
index 5f7c6eff3..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_edit.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_help.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_help.png
deleted file mode 100644
index 382d314ca..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_help.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png
deleted file mode 100644
index 742ba271c..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png
deleted file mode 100644
index 5ee148080..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png
deleted file mode 100644
index 9438aa597..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png
deleted file mode 100644
index 9fd81097b..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_play.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_play.png
deleted file mode 100644
index 869f0014b..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_play.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png
deleted file mode 100644
index c4b7783cc..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index f594b4e48..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png
deleted file mode 100644
index 287ae2fb0..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png
deleted file mode 100644
index fc0dd57b6..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_settings.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100644
index 0eb78f7c7..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_settings.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png
deleted file mode 100644
index 8a6cbfea2..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png
deleted file mode 100644
index b53640176..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png
deleted file mode 100644
index e08afae85..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_grey_24dp.png
new file mode 100644
index 000000000..325803180
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_grey_24dp.png
new file mode 100644
index 000000000..c3255bdf6
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_grey_24dp.png
new file mode 100644
index 000000000..5592d5c80
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_paste_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_paste_grey_24dp.png
new file mode 100644
index 000000000..f657587d7
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_paste_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png
new file mode 100644
index 000000000..b72a9f3c6
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_done_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_done_grey_24dp.png
new file mode 100644
index 000000000..6e42e1359
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_done_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_grey_24dp.png
new file mode 100644
index 000000000..c2222fb8e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_file_upload_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_upload_grey_24dp.png
new file mode 100644
index 000000000..569b7704f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_upload_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_grey_24dp.png
new file mode 100644
index 000000000..e3dccd298
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png
index b6b3129f5..af025f2d1 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png
new file mode 100644
index 000000000..9f24b7b60
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_import_export_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_import_export_grey_24dp.png
new file mode 100644
index 000000000..961aedecc
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_import_export_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_grey_24dp.png
new file mode 100644
index 000000000..4034dc9f2
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_grey_24dp.png
new file mode 100644
index 000000000..ddd39f2fc
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_grey_24dp.png
new file mode 100644
index 000000000..25d5688e3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_person_add_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_add_grey_24dp.png
new file mode 100644
index 000000000..da48a4952
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_add_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_24dp.png
new file mode 100644
index 000000000..af025f2d1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_grey_24dp.png
new file mode 100644
index 000000000..264416933
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_save_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_grey_24dp.png
new file mode 100644
index 000000000..3ead270a0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_search_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_grey_24dp.png
new file mode 100644
index 000000000..ba65a135b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_select_all_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_select_all_grey_24dp.png
new file mode 100644
index 000000000..99f57a2da
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_select_all_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_grey_24dp.png
new file mode 100644
index 000000000..20d2b66e0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_grey_24dp.png
new file mode 100644
index 000000000..987e9b86c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_view_list_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_view_list_grey_24dp.png
new file mode 100644
index 000000000..c031adccf
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_view_list_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_warning_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_warning_grey_24dp.png
new file mode 100644
index 000000000..eeea75b6f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_warning_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png
index 2bf88c183..41b89b5b6 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png
deleted file mode 100644
index c43cf6553..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png
deleted file mode 100644
index 9f4c3d6a2..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png
deleted file mode 100644
index 266d4c21f..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collection.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collection.png
deleted file mode 100644
index b89ea93ff..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collection.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_copy.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_copy.png
deleted file mode 100644
index 713482020..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_copy.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png
deleted file mode 100644
index 9dfb7cc2c..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png
deleted file mode 100644
index cf5fab3ad..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png
deleted file mode 100644
index c2ead0cef..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_edit.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_edit.png
deleted file mode 100644
index 650b4d899..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_edit.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_help.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_help.png
deleted file mode 100644
index 5876cdea4..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_help.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png
deleted file mode 100644
index 1d6522beb..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png
deleted file mode 100644
index dd5289ee4..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png
deleted file mode 100644
index 940aae781..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png
deleted file mode 100644
index 359da1c12..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_play.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_play.png
deleted file mode 100644
index 5f3bf86fd..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_play.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png
deleted file mode 100644
index 61304a68c..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index f6719d228..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png
deleted file mode 100644
index d49217234..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png
deleted file mode 100644
index da37d7a6e..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_settings.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100644
index c290e5902..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_settings.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png
deleted file mode 100644
index bff81179a..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png
deleted file mode 100644
index 5bef3ca81..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png
deleted file mode 100644
index 4fe0edfa3..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_grey_24dp.png
new file mode 100644
index 000000000..1c382e5f5
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_grey_24dp.png
new file mode 100644
index 000000000..a90997d7b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_grey_24dp.png
new file mode 100644
index 000000000..bab9b4d66
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_paste_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_paste_grey_24dp.png
new file mode 100644
index 000000000..fbf5786b3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_paste_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png
new file mode 100644
index 000000000..e757fdb07
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_done_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_done_grey_24dp.png
new file mode 100644
index 000000000..9f860915d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_done_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_grey_24dp.png
new file mode 100644
index 000000000..b3ef8ce73
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_file_upload_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_upload_grey_24dp.png
new file mode 100644
index 000000000..ca89ff472
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_upload_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_grey_24dp.png
new file mode 100644
index 000000000..1028bfaf3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png
index f763dd259..a78e7e6a0 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png
new file mode 100644
index 000000000..42032d918
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_import_export_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_import_export_grey_24dp.png
new file mode 100644
index 000000000..f7faa5cf4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_import_export_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_grey_24dp.png
new file mode 100644
index 000000000..3aa7f36a1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_grey_24dp.png
new file mode 100644
index 000000000..eff685ef1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_grey_24dp.png
new file mode 100644
index 000000000..bae3480cb
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_person_add_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_add_grey_24dp.png
new file mode 100644
index 000000000..58edadf61
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_add_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_24dp.png
new file mode 100644
index 000000000..a78e7e6a0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_grey_24dp.png
new file mode 100644
index 000000000..4ff5decb0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_save_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_grey_24dp.png
new file mode 100644
index 000000000..e72945d9e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_search_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_grey_24dp.png
new file mode 100644
index 000000000..29954062c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_select_all_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_select_all_grey_24dp.png
new file mode 100644
index 000000000..d88de42e6
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_select_all_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_grey_24dp.png
new file mode 100644
index 000000000..5a1b41f03
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_grey_24dp.png
new file mode 100644
index 000000000..ee0248838
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_view_list_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_view_list_grey_24dp.png
new file mode 100644
index 000000000..b90d335f9
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_view_list_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_warning_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_warning_grey_24dp.png
new file mode 100644
index 000000000..f00e106c2
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_warning_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png
index f1ec295d2..ee8067c7d 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
deleted file mode 100644
index 91434a47b..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
deleted file mode 100644
index ca7d159fd..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
deleted file mode 100644
index 0769899fd..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collection.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collection.png
deleted file mode 100644
index 88240fd30..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collection.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_copy.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_copy.png
deleted file mode 100644
index 5ddf15139..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_copy.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png
deleted file mode 100644
index db69d6c25..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png
deleted file mode 100644
index b8915716e..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png
deleted file mode 100644
index 38a3aeea6..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_edit.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_edit.png
deleted file mode 100644
index 8ab436d87..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_edit.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_help.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_help.png
deleted file mode 100644
index 19a9df332..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_help.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
deleted file mode 100644
index 5e48a9c6b..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png
deleted file mode 100644
index 312a230e7..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png
deleted file mode 100644
index 5fa309cd8..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png
deleted file mode 100644
index 03eeb8d6a..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_play.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_play.png
deleted file mode 100644
index 7f709bbf1..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_play.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png
deleted file mode 100644
index 29c5f4d3b..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index aad535e97..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png
deleted file mode 100644
index 2a0898381..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png
deleted file mode 100644
index af37a3680..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_settings.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100644
index 999d0f0d8..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_settings.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png
deleted file mode 100644
index 2f6dc413b..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png
deleted file mode 100644
index 27af9a43c..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png
deleted file mode 100644
index a38638e4d..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_grey_24dp.png
new file mode 100644
index 000000000..fb9f88d2a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_grey_24dp.png
new file mode 100644
index 000000000..efcffe3fb
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_grey_24dp.png
new file mode 100644
index 000000000..68ccece61
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_paste_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_paste_grey_24dp.png
new file mode 100644
index 000000000..9ad5aab8f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_paste_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png
new file mode 100644
index 000000000..c6bb43e8b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_done_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_done_grey_24dp.png
new file mode 100644
index 000000000..36ed24eec
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_done_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_grey_24dp.png
new file mode 100644
index 000000000..aa89d4977
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_upload_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_upload_grey_24dp.png
new file mode 100644
index 000000000..908b1567c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_upload_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_grey_24dp.png
new file mode 100644
index 000000000..190df8236
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png
index 212293db0..738e3490d 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png
new file mode 100644
index 000000000..72c7e7bb0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_import_export_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_import_export_grey_24dp.png
new file mode 100644
index 000000000..22ff0c308
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_import_export_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_grey_24dp.png
new file mode 100644
index 000000000..c398ccf04
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_grey_24dp.png
new file mode 100644
index 000000000..4b7c23f46
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_grey_24dp.png
new file mode 100644
index 000000000..4c95bd577
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_add_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_add_grey_24dp.png
new file mode 100644
index 000000000..1ab31fed1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_add_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_24dp.png
new file mode 100644
index 000000000..738e3490d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_grey_24dp.png
new file mode 100644
index 000000000..689fda259
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_grey_24dp.png
new file mode 100644
index 000000000..fad94a7fc
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_grey_24dp.png
new file mode 100644
index 000000000..f9c0b2ec3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_select_all_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_select_all_grey_24dp.png
new file mode 100644
index 000000000..3d385f50c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_select_all_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_grey_24dp.png
new file mode 100644
index 000000000..2251d2bbb
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png
new file mode 100644
index 000000000..88a0edd6c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_view_list_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_view_list_grey_24dp.png
new file mode 100644
index 000000000..0e7f15a4b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_view_list_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_warning_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_warning_grey_24dp.png
new file mode 100644
index 000000000..08177e7b4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_warning_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png
index da24654eb..d9b5cc007 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
deleted file mode 100644
index f18aa6144..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
deleted file mode 100644
index f97084dbe..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collection.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collection.png
deleted file mode 100644
index c41ca8c8b..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collection.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_copy.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_copy.png
deleted file mode 100644
index a0508df8c..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_copy.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
deleted file mode 100644
index b522daffe..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png
deleted file mode 100644
index ef7785a48..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_edit.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_edit.png
deleted file mode 100644
index f2b2078b0..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_edit.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_help.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_help.png
deleted file mode 100644
index c5a34319b..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_help.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
deleted file mode 100644
index f054a68e6..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
deleted file mode 100644
index 4aa9dc85c..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png
deleted file mode 100644
index 3589aeb55..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png
deleted file mode 100644
index fd1bcdd45..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_play.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_play.png
deleted file mode 100644
index df5994710..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_play.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png
deleted file mode 100644
index 744350049..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png
deleted file mode 100644
index 9c0ea3ca0..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png
deleted file mode 100644
index d8c094ed8..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png
deleted file mode 100644
index aa5937eab..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_settings.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_settings.png
deleted file mode 100644
index 530227e2d..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_settings.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png
deleted file mode 100644
index 3e441000f..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png
deleted file mode 100644
index 48a0cd149..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png
deleted file mode 100644
index b00a85f6d..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_grey_24dp.png
new file mode 100644
index 000000000..3179d765c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_grey_24dp.png
new file mode 100644
index 000000000..0bcacc545
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_grey_24dp.png
new file mode 100644
index 000000000..2fdbbea13
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_paste_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_paste_grey_24dp.png
new file mode 100644
index 000000000..b1348527b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_paste_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png
new file mode 100644
index 000000000..4886ab1e9
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_done_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_done_grey_24dp.png
new file mode 100644
index 000000000..c836c5490
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_done_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_grey_24dp.png
new file mode 100644
index 000000000..e61a48a4d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_upload_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_upload_grey_24dp.png
new file mode 100644
index 000000000..77d80081f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_upload_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_grey_24dp.png
new file mode 100644
index 000000000..6fbc40459
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png
index 130c670c9..de2a86e89 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png
new file mode 100644
index 000000000..d0d0224df
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_import_export_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_import_export_grey_24dp.png
new file mode 100644
index 000000000..3edec452e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_import_export_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_grey_24dp.png
new file mode 100644
index 000000000..aac70d9bb
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_grey_24dp.png
new file mode 100644
index 000000000..3280b2658
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_grey_24dp.png
new file mode 100644
index 000000000..6ed4351ca
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_add_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_add_grey_24dp.png
new file mode 100644
index 000000000..993118372
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_add_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_24dp.png
new file mode 100644
index 000000000..de2a86e89
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_grey_24dp.png
new file mode 100644
index 000000000..ba62a8102
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_grey_24dp.png
new file mode 100644
index 000000000..6ecab92a7
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_grey_24dp.png
new file mode 100644
index 000000000..9424ae98e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_select_all_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_select_all_grey_24dp.png
new file mode 100644
index 000000000..f61ac41df
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_select_all_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_grey_24dp.png
new file mode 100644
index 000000000..6a70402b4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png
new file mode 100644
index 000000000..89136d7c3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_view_list_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_view_list_grey_24dp.png
new file mode 100644
index 000000000..ccedde141
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_view_list_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_warning_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_warning_grey_24dp.png
new file mode 100644
index 000000000..dc007ee65
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_warning_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png
new file mode 100644
index 000000000..be1bc9ef4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_grey_24dp.png
new file mode 100644
index 000000000..e3121dbff
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_grey_24dp.png
new file mode 100644
index 000000000..ec5434a3c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_grey_24dp.png
new file mode 100644
index 000000000..1eb62d42c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_paste_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_paste_grey_24dp.png
new file mode 100644
index 000000000..42240540c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_paste_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png
new file mode 100644
index 000000000..e4e218123
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_done_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_done_grey_24dp.png
new file mode 100644
index 000000000..c4899687b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_done_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_grey_24dp.png
new file mode 100644
index 000000000..c7e86f9dc
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_upload_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_upload_grey_24dp.png
new file mode 100644
index 000000000..995a3879e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_upload_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_grey_24dp.png
new file mode 100644
index 000000000..0107ea21c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_generic_man.png
new file mode 100644
index 000000000..e664e94ac
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_generic_man.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png
new file mode 100644
index 000000000..9d14c61a2
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_import_export_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_import_export_grey_24dp.png
new file mode 100644
index 000000000..3dea0d014
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_import_export_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_grey_24dp.png
new file mode 100644
index 000000000..0580f3290
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_grey_24dp.png
new file mode 100644
index 000000000..e500bc8f7
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_grey_24dp.png
new file mode 100644
index 000000000..0c0fd76f6
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_add_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_add_grey_24dp.png
new file mode 100644
index 000000000..5f3ac2804
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_add_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_24dp.png
new file mode 100644
index 000000000..e664e94ac
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_grey_24dp.png
new file mode 100644
index 000000000..1cb4aaac5
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_grey_24dp.png
new file mode 100644
index 000000000..6c8f219e8
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_grey_24dp.png
new file mode 100644
index 000000000..037640959
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_select_all_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_select_all_grey_24dp.png
new file mode 100644
index 000000000..93657cbde
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_select_all_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_grey_24dp.png
new file mode 100644
index 000000000..5eba9e8ec
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png
new file mode 100644
index 000000000..e15c0568d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_view_list_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_view_list_grey_24dp.png
new file mode 100644
index 000000000..f2c9d42de
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_view_list_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_warning_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_warning_grey_24dp.png
new file mode 100644
index 000000000..88e618bab
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_warning_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index cd74255c7..784996c0d 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -21,7 +21,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="6dp"
-            android:src="@drawable/ic_action_person" />
+            android:src="@drawable/ic_person_grey_24dp" />
 
         <TextView
             android:id="@+id/api_account_settings_acc_name"
diff --git a/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
index d31ae52d7..39d87ee25 100644
--- a/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
@@ -14,7 +14,7 @@
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:id="@+id/imageView"
-        android:src="@drawable/ic_action_person" />
+        android:src="@drawable/ic_person_grey_24dp" />
 
     <TextView
         android:id="@+id/api_accounts_adapter_item_name"
diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
index c4ea46d43..9166f958e 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
@@ -17,7 +17,7 @@
         android:id="@+id/api_apps_adapter_install_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_action_download"
+        android:src="@drawable/ic_file_download_grey_24dp"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index f678825aa..d817f9269 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -135,7 +135,7 @@
             android:layout_weight="1"
             android:text="@string/btn_next"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_play"
+            android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 394ef10f4..a5646dc26 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -50,7 +50,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:hint="@string/filemanager_title_open"
-                    android:drawableRight="@drawable/ic_action_collection"
+                    android:drawableRight="@drawable/ic_folder_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical" />
             </LinearLayout>
@@ -82,7 +82,7 @@
                     android:text="@string/btn_decrypt_verify_file"
                     android:clickable="true"
                     style="@style/SelectableItem"
-                    android:drawableRight="@drawable/ic_action_save"
+                    android:drawableRight="@drawable/ic_save_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:layout_alignParentBottom="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index cbe03056c..0f341b2d6 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_add_share_decrypted_text"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_weight="1" />
@@ -77,7 +77,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index 2ffbc66f4..9bd4e61c0 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -26,7 +26,7 @@
             android:layout_height="match_parent"
             android:text="@string/edit_key_action_change_passphrase"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_edit"
+            android:drawableRight="@drawable/ic_mode_edit_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
@@ -69,7 +69,7 @@
             android:layout_height="match_parent"
             android:text="@string/edit_key_action_add_identity"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_add_person"
+            android:drawableRight="@drawable/ic_person_add_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index d62c9f32b..6f822148e 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -25,7 +25,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_encrypt_files"
-        android:drawableRight="@drawable/ic_action_collection"
+        android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -45,7 +45,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_encrypt_text"
-        android:drawableRight="@drawable/ic_action_copy"
+        android:drawableRight="@drawable/ic_content_copy_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -72,7 +72,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_decrypt_files"
-        android:drawableRight="@drawable/ic_action_collection"
+        android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -121,7 +121,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_paste"
+            android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical" />
 
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index f4c479ee9..26b1d809d 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -46,7 +46,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/btn_encrypt_share_file"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -63,7 +63,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_save"
+                android:src="@drawable/ic_save_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
index 83e2cf9ee..6f7b636e1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
@@ -42,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_share_encrypted_signed"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_weight="1" />
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml
index deefd0428..3a559c71c 100644
--- a/OpenKeychain/src/main/res/layout/file_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/file_dialog.xml
@@ -41,7 +41,7 @@
             android:layout_margin="4dp"
             android:contentDescription="@string/filemanager_title_open"
             android:background="@drawable/button_rounded"
-            android:src="@drawable/ic_action_collection"/>
+            android:src="@drawable/ic_folder_grey_24dp"/>
     </LinearLayout>
 
     <CheckBox
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
index f6fde2447..fafdd1713 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -53,7 +53,7 @@
             android:layout_alignParentRight="true"
             android:paddingRight="16dip"
             android:paddingLeft="16dip"
-            android:src="@drawable/ic_action_cancel"
+            android:src="@drawable/ic_close_grey_24dp"
             android:clickable="true"
             android:layout_centerVertical="true"
             style="@style/SelectableItem"/>
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
index f2caab653..f2ee4079e 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
@@ -15,7 +15,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:text="@string/btn_add_files"
-            android:drawableLeft="@drawable/ic_action_collection"
+            android:drawableLeft="@drawable/ic_folder_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index ba80214a6..443a7cde4 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -38,7 +38,7 @@
                 android:layout_weight="1"
                 android:text="@string/first_time_import_key"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_collection"
+                android:drawableRight="@drawable/ic_folder_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index fcc84f50f..6ac0b468c 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -73,7 +73,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/import_import"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_download"
+                android:drawableRight="@drawable/ic_file_download_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
index 6f52e1938..a7234d848 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_search"
+            android:src="@drawable/ic_search_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
@@ -46,7 +46,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_settings"
+            android:src="@drawable/ic_settings_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
index b1056dab3..bde4dafc0 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:text="@string/filemanager_title_open"
             android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_collection"
+            android:drawableRight="@drawable/ic_folder_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
@@ -38,7 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_paste"
+            android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/log_display_item.xml b/OpenKeychain/src/main/res/layout/log_display_item.xml
index d3938aaf0..d35413185 100644
--- a/OpenKeychain/src/main/res/layout/log_display_item.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_item.xml
@@ -32,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/log_sub"
-            android:src="@drawable/ic_action_view_as_list"
+            android:src="@drawable/ic_view_list_grey_24dp"
             android:layout_marginBottom="4dp"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 19e37783b..6b7390b27 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -59,7 +59,7 @@
                     android:layout_height="match_parent"
                     android:text="@string/btn_export_to_server"
                     android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:drawableRight="@drawable/ic_action_upload"
+                    android:drawableRight="@drawable/ic_file_upload_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 0a6b46a93..08be4ab05 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -214,7 +214,7 @@
                 style="@style/SelectableItem"
                 android:text="@string/btn_view_cert_key"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_person"
+                android:drawableRight="@drawable/ic_person_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index a6224a8d1..ec26b4a76 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -40,7 +40,7 @@
                 android:text=""
                 android:layout_weight="1"
                 android:typeface="monospace"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
@@ -114,7 +114,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/key_view_action_share_with"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -131,7 +131,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
@@ -171,7 +171,7 @@
             style="@style/SelectableItem"
             android:text="@string/key_view_action_upload"
             android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_upload"
+            android:drawableRight="@drawable/ic_file_upload_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
index f41109d84..1062d0727 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -26,7 +26,7 @@
 
         <ImageView
             android:id="@+id/subkey_item_edit_image"
-            android:src="@drawable/ic_action_edit"
+            android:src="@drawable/ic_mode_edit_grey_24dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp" />
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp"
-            android:src="@drawable/ic_action_cancel"
+            android:src="@drawable/ic_close_grey_24dp"
             style="@style/SelectableItem" />
 
     </FrameLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index 63c1ee70f..ff485cd48 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -61,7 +61,7 @@
         android:id="@+id/user_id_item_edit_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/ic_action_edit"
+        android:src="@drawable/ic_mode_edit_grey_24dp"
         android:padding="8dp"
         android:layout_gravity="center_vertical" />
 
@@ -70,7 +70,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:padding="8dp"
-        android:src="@drawable/ic_action_cancel"
+        android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
         style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index c724c46a5..4a9fe16c7 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -22,7 +22,7 @@
 
     <item
         android:id="@+id/menu_key_view_delete"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="@drawable/ic_delete_grey_24dp"
         app:showAsAction="never"
         android:title="@string/menu_delete_key" />