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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collection.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_copy.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_edit.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_help.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_play.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_settings.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png and /dev/null differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collection.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_copy.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_edit.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_help.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_play.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png and /dev/null differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collection.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_copy.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_edit.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_help.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_play.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png and /dev/null differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey600_24dp.png differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collection.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_copy.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_edit.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_help.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_play.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png and /dev/null differ
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
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png and /dev/null differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey600_24dp.png differ
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
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey600_24dp.png differ