diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index 11e0cda18..d513e0a7a 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -59,3 +59,6 @@ python copy OpenKeychain file white folder 24
 
 # multi select
 python copy OpenKeychain action white lock 24
+
+# yubikey dialog
+python copy OpenKeychain action black check_circle 48
\ No newline at end of file
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 699619e5c..2dcdb3251 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -692,7 +692,7 @@
          -->
         <activity
             android:name=".ui.NfcOperationActivity"
-            android:theme="@style/KeychainTheme.DialogWithoutTitle"
+            android:theme="@style/KeychainTheme.YubiKeyDialog"
             android:allowTaskReparenting="true"
             android:launchMode="singleTop"
             android:taskAffinity=":Nfc" />
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png
index 37931a0ad..d9a5ebedf 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
index 5fa494878..a2051cef9 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_circle_black_48dp.png
new file mode 100644
index 000000000..1c2ddcd5f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_circle_black_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png
index f42a0e2d2..729f29010 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png
index d5a928783..1a9cd75a0 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png
index 0fd15563a..ceb1a1eeb 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
index dc8c85cce..9a9e5706f 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png
index 35e3b426f..57139a78a 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png
index ed993f35d..9625f148f 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
index 9f5c75609..02ea533a8 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
index 05be749c3..374fafd7f 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
index 0888c6173..de5029591 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
index b94735ecb..cd4f04aa1 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png
index 3ee3e1720..595ff10ac 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
index 164385d04..57c9fa546 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
index cd16fdd50..ffa7be933 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png
index 612e73458..81c5be793 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png
index 8c9e9cec0..dd3f10664 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png
index a2fc5b2e7..bbfbc96cb 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
index b16209fc1..acf1ddf85 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png
index 2839b1352..20ba48063 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png
index c900b8ec7..e05e76ffc 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png
index 5b1fd7766..aaadd5c46 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
index 9e662f6d4..d571552fb 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_circle_black_48dp.png
new file mode 100644
index 000000000..86bf38e98
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_circle_black_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png
index e91f9048b..dfcb55d02 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png
index 4ebf8a227..40a1a84e3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png
index e80681aeb..af7f8288d 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
index 4ad9e552d..c94cc28f1 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png
index a5ab2c5d3..08c16a328 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png
index 73fc3b422..feb85a775 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
index 1c5797c9e..831d723ba 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png
index f3743dc20..f6e789ba1 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png
index d18d4b667..3a4a1586e 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
index 381b6a118..1127f87f7 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png
index 85cff0b91..12b09f1d9 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
index 8d1e433a5..c61e948bb 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
index 235c84f1e..97e42b525 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png
index 8a2b641ca..b1c2e04ab 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png
index bb26bc075..015062ed3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png
index dff1e3a8a..faefc59c8 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
index 3405c951d..c59419c02 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png
index f0ff945b8..f02d360aa 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png
index 5e8781731..f7ac2a184 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png
index c8187799b..22f12110e 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
index addbfc886..ce5b878b0 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_circle_black_48dp.png
new file mode 100644
index 000000000..872b578c8
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_circle_black_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
index e5024472a..3b2b65d26 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png
index ed2b2525f..6bc437298 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
index 76e07f097..b7c7ffd0e 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
index c6f0e6b85..1cf76a960 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png
index 47c7b52a1..323360ead 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png
index 45d30d999..d3ee65e9a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
index e5f54cef0..71a5a137c 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
index 87095ef26..d3542c6bc 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png
index 8856c70df..2a166945a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
index c5e9d0b49..ad8d91a99 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png
index 7f0ea51bf..5a06bff5a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
index a55d19922..a3c80e73d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
index 5f89fc257..1989184b1 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png
index 729220066..ad8b8c0df 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png
index aa0332092..adda09575 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
index 043759acd..bfc3e3939 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
index 2b775b646..e84e188a1 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png
index 4b3675766..81c80b700 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png
index ccbdce4ab..a8761c90a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png
index 626543b47..6d0fe2c00 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
index 4057cc545..746d77579 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_circle_black_48dp.png
new file mode 100644
index 000000000..6d3b6449c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_circle_black_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
index 6e03d54cf..2c2ad771f 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png
index 08f59ea1e..51b4401ca 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
index 0eb9d8b08..6b717e0dd 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
index 081fbec5b..074ea8807 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png
index 0470e3f02..ee92f4ecd 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png
index aadd04af6..5cd142c1d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
index 0d1ac4876..b93d5a1e4 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
index f32d7e708..645822e83 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png
index c49d420e0..a7caa2db8 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
index 0dcada814..0e52c7c75 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png
index 34ec7092f..02e19d045 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
index 043acd808..547ef30aa 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
index 72128fe69..1692d8a24 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png
index 63f8de50f..5de7a2951 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png
index 6c87e1358..3e0ce1a5f 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
index 0bbeab150..abbb98951 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
index 47f0e0d82..3023ff8da 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png
index 09d4df6af..784933ad5 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png
index 736bde37a..16b1e4e24 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png
index d12d2e796..bfbe789c3 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
index 02f2f6fe8..fb06e1d48 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_circle_black_48dp.png
new file mode 100644
index 000000000..0e3b23964
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_circle_black_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
index 87892840e..d670618c7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png
index c5d79caff..df42feecb 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
index 7b2a480a0..396419219 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
index 04c07fb56..1f6af72d0 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png
index 08ae54533..99c6e3e1c 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png
index 228b2a982..ad852e3e6 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
index 7a3c198ee..a1afbe9da 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
index a4286b54c..7c4823055 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png
index db080df4e..e66dd967d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png
index a70c55b7e..a55147be1 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png
index 9380370f4..d6668a051 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
index 7cc008475..be5c062b5 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
index d271d8e03..f5beca251 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png
index f3c284330..c7f3072ee 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png
index 51998492c..bd80bf1f7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png
index 70c21baf7..dd5adfc7f 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
index bce161d00..476d5c978 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png
index 0fe15fc05..5a8544ce5 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png
index 3451d9855..f04166536 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
index 724b4606c..90ee4f9ca 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -19,38 +19,36 @@
         android:paddingTop="16dp"
         custom:initialView="0">
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/toolbar_include"
-            android:layout_gravity="center"
-            android:orientation="vertical">
+            android:layout_height="wrap_content">
 
             <TextView
+                android:id="@+id/nfc_activity_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/nfc_text"
                 android:textAppearance="@android:style/TextAppearance.Medium" />
 
             <ImageView
+                android:id="@+id/nfc_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/nfc_activity_text"
                 android:layout_marginTop="8dp"
                 android:adjustViewBounds="true"
-                android:src="@drawable/yubikey_phone"
-                android:id="@+id/nfc_image"
-                android:background="@android:color/transparent" />
-        </LinearLayout>
+                android:background="@android:color/transparent"
+                android:src="@drawable/yubikey_phone" />
+        </RelativeLayout>
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/toolbar_include"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:orientation="vertical">
+            android:layout_height="wrap_content">
 
             <TextView
+                android:id="@+id/nfc_activity_text2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/nfc_wait"
@@ -60,27 +58,62 @@
                 style="?android:attr/progressBarStyleLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
                 android:padding="8dp" />
 
-        </LinearLayout>
+            <!-- placeholder to retain dialog size -->
+            <ImageView
+                android:id="@+id/nfc_image_placeholder1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/nfc_activity_text2"
+                android:layout_marginTop="8dp"
+                android:adjustViewBounds="true"
+                android:background="@android:color/transparent"
+                android:src="@drawable/yubikey_phone"
+                android:visibility="invisible" />
 
-        <LinearLayout
+        </RelativeLayout>
+
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/toolbar_include"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:orientation="vertical">
+            android:layout_height="wrap_content">
 
             <TextView
+                android:id="@+id/nfc_activity_text3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/nfc_finished"
                 android:textAppearance="@android:style/TextAppearance.Medium" />
 
-        </LinearLayout>
+            <!-- placeholder to retain dialog size -->
+            <ImageView
+                android:id="@+id/nfc_image_placeholder2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/nfc_activity_text3"
+                android:layout_marginTop="8dp"
+                android:adjustViewBounds="true"
+                android:background="@android:color/transparent"
+                android:src="@drawable/yubikey_phone"
+                android:visibility="invisible" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:adjustViewBounds="true"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_check_circle_black_48dp" />
+
+        </RelativeLayout>
 
     </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e76cb5b36..5a43fda19 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -226,8 +226,8 @@
     <string name="pin_for">"Enter PIN for '%s'"</string>
     <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
     <string name="nfc_text">"Hold YubiKey against the NFC marker at the back of your device."</string>
-    <string name="nfc_wait">"Don't release the YubiKey yet!"</string>
-    <string name="nfc_finished">"Success"</string>
+    <string name="nfc_wait">"Keep the YubiKey at the back!"</string>
+    <string name="nfc_finished">"Please take away the YubiKey now."</string>
     <string name="file_delete_confirmation_title">"Delete original files?"</string>
     <string name="file_delete_confirmation">"The following files will be deleted:%s"</string>
     <string name="file_delete_successful">"%1$d out of %2$d files have been deleted.%3$s"</string>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 1760ca5ec..8e0ea6ac0 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -36,7 +36,7 @@
         <!--<item name="suggestionRowLayout">...</item>-->
     </style>
 
-    <style name="KeychainTheme.DialogWithoutTitle" parent="@style/Theme.AppCompat.Light.Dialog.MinWidth">
+    <style name="KeychainTheme.YubiKeyDialog" parent="@style/Theme.AppCompat.Light.Dialog.MinWidth">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>