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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_paste_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_done_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_upload_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_grey_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_import_export_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_add_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_select_all_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_view_list_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_warning_grey_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_paste_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_done_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_upload_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_grey_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_import_export_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_add_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_select_all_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_view_list_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_warning_grey_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_paste_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_done_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_upload_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_grey_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_generic_man.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_import_export_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_add_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_select_all_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_view_list_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_warning_grey_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_paste_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_done_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_upload_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_grey_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_import_export_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_add_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_select_all_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_view_list_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_warning_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_paste_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_done_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_upload_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_generic_man.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_import_export_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_add_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_select_all_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_view_list_grey_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_warning_grey_24dp.png differ