aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-04 19:04:15 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-04 19:04:15 +0100
commitde31fcc45fac49683ae49e15d070df7b13a15a41 (patch)
tree9ff9632cad4173bbc155079c1ff25f6a23e52c16
parent1aebd7412f5cdd3fde31f502ac1baecaeba453da (diff)
downloadopen-keychain-de31fcc45fac49683ae49e15d070df7b13a15a41.tar.gz
open-keychain-de31fcc45fac49683ae49e15d070df7b13a15a41.tar.bz2
open-keychain-de31fcc45fac49683ae49e15d070df7b13a15a41.zip
Partially fix file names
-rw-r--r--Graphics/drawables/ic_cloud_search.svg (renamed from Graphics/drawables/ic_cloud_search_24px.svg)0
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_18dp.pngbin0 -> 466 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_24dp.pngbin0 -> 434 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_36dp.pngbin0 -> 661 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_48dp.pngbin0 -> 583 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_18dp.pngbin0 -> 651 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_24dp.pngbin0 -> 642 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_36dp.pngbin0 -> 938 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_48dp.pngbin0 -> 954 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_18dp.pngbin0 -> 480 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_24dp.pngbin0 -> 467 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_36dp.pngbin0 -> 717 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_48dp.pngbin0 -> 704 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_18dp.pngbin0 -> 331 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_24dp.pngbin0 -> 261 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_36dp.pngbin0 -> 434 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_48dp.pngbin0 -> 371 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_18dp.pngbin0 -> 449 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_24dp.pngbin0 -> 382 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_36dp.pngbin0 -> 642 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_48dp.pngbin0 -> 583 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_18dp.pngbin0 -> 353 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_24dp.pngbin0 -> 280 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_36dp.pngbin0 -> 467 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_48dp.pngbin0 -> 446 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_18dp.pngbin0 -> 434 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_24dp.pngbin0 -> 371 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_36dp.pngbin0 -> 583 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_48dp.pngbin0 -> 730 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_18dp.pngbin0 -> 642 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_24dp.pngbin0 -> 583 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_36dp.pngbin0 -> 954 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_48dp.pngbin0 -> 1155 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_18dp.pngbin0 -> 467 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_24dp.pngbin0 -> 446 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_36dp.pngbin0 -> 704 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_48dp.pngbin0 -> 908 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_18dp.pngbin0 -> 661 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_24dp.pngbin0 -> 583 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_36dp.pngbin0 -> 1080 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_48dp.pngbin0 -> 1093 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_18dp.pngbin0 -> 938 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_24dp.pngbin0 -> 954 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_36dp.pngbin0 -> 1578 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_48dp.pngbin0 -> 1805 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_18dp.pngbin0 -> 717 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_24dp.pngbin0 -> 704 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_36dp.pngbin0 -> 1254 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_48dp.pngbin0 -> 1351 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_18dp.pngbin0 -> 583 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_24dp.pngbin0 -> 730 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_36dp.pngbin0 -> 1093 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_48dp.pngbin0 -> 1703 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_18dp.pngbin0 -> 954 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_24dp.pngbin0 -> 1155 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_36dp.pngbin0 -> 1805 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_48dp.pngbin0 -> 2523 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_18dp.pngbin0 -> 704 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_24dp.pngbin0 -> 908 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_36dp.pngbin0 -> 1351 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_48dp.pngbin0 -> 2081 bytes
-rw-r--r--Graphics/drawables/originals/key-plus/drawable/key-plus.xml8
-rw-r--r--Graphics/drawables/originals/key-plus/readme.txt5
-rwxr-xr-xGraphics/update-drawables.sh45
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file_24dp.pngbin0 -> 524 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text_24dp.pngbin0 -> 651 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.pngbin556 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout_24dp.pngbin0 -> 805 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24dp.pngbin0 -> 726 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_key_plus_grey600_24dp.pngbin0 -> 642 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24dp.pngbin0 -> 1535 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.pngbin1302 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24dp.pngbin0 -> 2598 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.pngbin2289 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24dp.pngbin0 -> 1749 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.pngbin1530 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24dp.pngbin0 -> 1950 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.pngbin1751 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24dp.pngbin0 -> 743 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.pngbin675 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24dp.pngbin0 -> 806 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.pngbin748 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24dp.pngbin0 -> 736 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.pngbin675 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24dp.pngbin0 -> 906 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.pngbin789 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png)bin3241 -> 3241 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24dp.pngbin0 -> 485 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.pngbin444 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png)bin1656 -> 1656 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24dp.pngbin0 -> 962 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.pngbin861 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png)bin3638 -> 3638 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24dp.pngbin0 -> 742 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.pngbin740 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png)bin2878 -> 2878 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24dp.pngbin0 -> 925 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.pngbin813 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png)bin3257 -> 3257 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24dp.pngbin0 -> 772 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.pngbin695 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png)bin3277 -> 3277 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file_24dp.pngbin0 -> 406 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text_24dp.pngbin0 -> 513 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.pngbin424 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout_24dp.pngbin0 -> 585 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24dp.pngbin0 -> 506 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.pngbin712 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_key_plus_grey600_24dp.pngbin0 -> 382 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png)bin897 -> 897 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png)bin1746 -> 1746 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png)bin1153 -> 1153 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png)bin1353 -> 1353 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png)bin528 -> 528 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png)bin622 -> 622 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png)bin522 -> 522 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png)bin643 -> 643 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png)bin2411 -> 2411 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png)bin410 -> 410 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png)bin958 -> 958 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png)bin685 -> 685 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png)bin2475 -> 2475 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png)bin589 -> 589 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png)bin2105 -> 2105 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png)bin667 -> 667 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png)bin2314 -> 2314 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png)bin557 -> 557 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png)bin2148 -> 2148 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file_24dp.pngbin0 -> 623 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text_24dp.pngbin0 -> 787 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.pngbin701 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout_24dp.pngbin0 -> 1080 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24dp.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png)bin1025 -> 1025 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.pngbin1428 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_key_plus_grey600_24dp.pngbin0 -> 583 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png)bin2161 -> 2161 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png)bin3713 -> 3713 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png)bin2310 -> 2310 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png)bin2705 -> 2705 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png)bin911 -> 911 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png)bin1008 -> 1008 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png)bin911 -> 911 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png)bin1179 -> 1179 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png)bin4973 -> 4973 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png)bin676 -> 676 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png)bin2306 -> 2306 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png)bin1218 -> 1218 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png)bin5757 -> 5757 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png)bin1043 -> 1043 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png)bin4395 -> 4395 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png)bin1166 -> 1166 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png)bin4908 -> 4908 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png)bin1017 -> 1017 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png)bin5309 -> 5309 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file_24dp.pngbin0 -> 905 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text_24dp.pngbin0 -> 1082 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.pngbin855 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout_24dp.pngbin0 -> 1615 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24dp.pngbin0 -> 1587 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_key_plus_grey600_24dp.pngbin0 -> 954 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24dp.pngbin0 -> 3678 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.pngbin3073 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24dp.pngbin0 -> 6148 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.pngbin5303 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24dp.pngbin0 -> 3497 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.pngbin3158 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24dp.pngbin0 -> 4231 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.pngbin3765 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24dp.pngbin0 -> 1300 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.pngbin1160 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24dp.pngbin0 -> 1481 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.pngbin1316 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24dp.pngbin0 -> 1310 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.pngbin1165 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24dp.pngbin0 -> 1719 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.pngbin1590 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png)bin6986 -> 6986 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24dp.pngbin0 -> 809 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.pngbin694 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png)bin3701 -> 3701 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24dp.pngbin0 -> 1835 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.pngbin1660 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png)bin7922 -> 7922 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24dp.pngbin0 -> 1512 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.pngbin1377 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png)bin5952 -> 5952 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24dp.pngbin0 -> 1714 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.pngbin1555 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png)bin6544 -> 6544 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24dp.pngbin0 -> 1424 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.pngbin1319 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96dp.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png)bin7353 -> 7353 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_file_24dp.pngbin0 -> 1095 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_text_24dp.pngbin0 -> 1331 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_verified_cutout_24dp.pngbin0 -> 2168 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_search_24dp.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png)bin2128 -> 2128 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_key_plus_grey600_24dp.pngbin0 -> 1155 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_authenticate_24dp.pngbin0 -> 5211 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_certify_24dp.pngbin0 -> 8878 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_encrypt_24dp.pngbin0 -> 4734 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_sign_24dp.pngbin0 -> 6060 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_closed_24dp.pngbin0 -> 1740 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_error_24dp.pngbin0 -> 1919 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_open_24dp.pngbin0 -> 1764 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_expired_cutout_24dp.pngbin0 -> 2411 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_invalid_cutout_24dp.pngbin0 -> 958 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_revoked_cutout_24dp.pngbin0 -> 2475 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unknown_cutout_24dp.pngbin0 -> 2105 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unverified_cutout_24dp.pngbin0 -> 2314 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_cutout_24dp.pngbin0 -> 2148 bytes
-rw-r--r--OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/certify_key_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_final_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_result_include.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/first_time_activity.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_list_item.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_item.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/keyspinner_item.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/select_key_item.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml2
222 files changed, 36 insertions, 48 deletions
diff --git a/Graphics/drawables/ic_cloud_search_24px.svg b/Graphics/drawables/ic_cloud_search.svg
index 3b20e2d90..3b20e2d90 100644
--- a/Graphics/drawables/ic_cloud_search_24px.svg
+++ b/Graphics/drawables/ic_cloud_search.svg
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_18dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_18dp.png
new file mode 100644
index 000000000..d5420e3b3
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_24dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_24dp.png
new file mode 100644
index 000000000..7df34be77
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_36dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_36dp.png
new file mode 100644
index 000000000..970f44336
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_48dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_48dp.png
new file mode 100644
index 000000000..80bcc9e62
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_18dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_18dp.png
new file mode 100644
index 000000000..3cbf76ba3
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_24dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..af3bc9d05
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_36dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_36dp.png
new file mode 100644
index 000000000..c9e69db00
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_48dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_48dp.png
new file mode 100644
index 000000000..e0999bd81
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_18dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_18dp.png
new file mode 100644
index 000000000..a23143024
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_24dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_24dp.png
new file mode 100644
index 000000000..8fed05005
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_36dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_36dp.png
new file mode 100644
index 000000000..387d046b4
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_48dp.png b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_48dp.png
new file mode 100644
index 000000000..d45e7a4b6
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_18dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_18dp.png
new file mode 100644
index 000000000..ef4f8b36e
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_24dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_24dp.png
new file mode 100644
index 000000000..797d1f492
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_36dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_36dp.png
new file mode 100644
index 000000000..7df34be77
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_48dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_48dp.png
new file mode 100644
index 000000000..8bb7eb218
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_18dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_18dp.png
new file mode 100644
index 000000000..6ca369e37
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_24dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..6a9b6a9fe
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_36dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_36dp.png
new file mode 100644
index 000000000..af3bc9d05
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_48dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_48dp.png
new file mode 100644
index 000000000..144e82989
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_18dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_18dp.png
new file mode 100644
index 000000000..053348dbb
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_24dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_24dp.png
new file mode 100644
index 000000000..e52ae7e22
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_36dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_36dp.png
new file mode 100644
index 000000000..8fed05005
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_48dp.png b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_48dp.png
new file mode 100644
index 000000000..cb1ca76e4
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_18dp.png
new file mode 100644
index 000000000..7df34be77
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_24dp.png
new file mode 100644
index 000000000..8bb7eb218
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_36dp.png
new file mode 100644
index 000000000..80bcc9e62
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_48dp.png
new file mode 100644
index 000000000..827aa4b85
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_18dp.png
new file mode 100644
index 000000000..af3bc9d05
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..144e82989
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_36dp.png
new file mode 100644
index 000000000..e0999bd81
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_48dp.png
new file mode 100644
index 000000000..e69e5732c
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_18dp.png
new file mode 100644
index 000000000..8fed05005
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_24dp.png
new file mode 100644
index 000000000..cb1ca76e4
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_36dp.png
new file mode 100644
index 000000000..d45e7a4b6
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_48dp.png
new file mode 100644
index 000000000..e236e0176
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_18dp.png
new file mode 100644
index 000000000..970f44336
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_24dp.png
new file mode 100644
index 000000000..80bcc9e62
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_36dp.png
new file mode 100644
index 000000000..28af77c8b
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_48dp.png
new file mode 100644
index 000000000..5b859b5c8
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_18dp.png
new file mode 100644
index 000000000..c9e69db00
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..e0999bd81
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_36dp.png
new file mode 100644
index 000000000..3065946ce
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_48dp.png
new file mode 100644
index 000000000..e3f5674bc
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_18dp.png
new file mode 100644
index 000000000..387d046b4
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_24dp.png
new file mode 100644
index 000000000..d45e7a4b6
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_36dp.png
new file mode 100644
index 000000000..c82204fa3
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_48dp.png
new file mode 100644
index 000000000..4694a2a20
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_18dp.png
new file mode 100644
index 000000000..80bcc9e62
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_24dp.png
new file mode 100644
index 000000000..827aa4b85
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_36dp.png
new file mode 100644
index 000000000..5b859b5c8
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_48dp.png
new file mode 100644
index 000000000..7ab9fa2c3
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_18dp.png
new file mode 100644
index 000000000..e0999bd81
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..e69e5732c
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_36dp.png
new file mode 100644
index 000000000..e3f5674bc
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_48dp.png
new file mode 100644
index 000000000..1151dfa16
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_18dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_18dp.png
new file mode 100644
index 000000000..d45e7a4b6
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_18dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_24dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_24dp.png
new file mode 100644
index 000000000..e236e0176
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_24dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_36dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_36dp.png
new file mode 100644
index 000000000..4694a2a20
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_36dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_48dp.png b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_48dp.png
new file mode 100644
index 000000000..1d5f4942d
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_48dp.png
Binary files differ
diff --git a/Graphics/drawables/originals/key-plus/drawable/key-plus.xml b/Graphics/drawables/originals/key-plus/drawable/key-plus.xml
new file mode 100644
index 000000000..9cfdbe3e8
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/drawable/key-plus.xml
@@ -0,0 +1,8 @@
+<!-- drawable/key-plus.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path android:fillColor="#000" android:pathData="M6.5,3C8.46,3 10.13,4.25 10.74,6H22V9H18V12H15V9H10.74C10.13,10.75 8.46,12 6.5,12C4,12 2,10 2,7.5C2,5 4,3 6.5,3M6.5,6A1.5,1.5 0 0,0 5,7.5A1.5,1.5 0 0,0 6.5,9A1.5,1.5 0 0,0 8,7.5A1.5,1.5 0 0,0 6.5,6M8,17H11V14H13V17H16V19H13V22H11V19H8V17Z" />
+</vector> \ No newline at end of file
diff --git a/Graphics/drawables/originals/key-plus/readme.txt b/Graphics/drawables/originals/key-plus/readme.txt
new file mode 100644
index 000000000..cb0ceb16a
--- /dev/null
+++ b/Graphics/drawables/originals/key-plus/readme.txt
@@ -0,0 +1,5 @@
+Thanks for visiting MaterialDesignIcons.com
+Check back often for new icons and follow @MaterialIcons for updates.
+
+Icon: key-plus
+By: Austin Andrews \ No newline at end of file
diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh
index 2e73641f5..4784af204 100755
--- a/Graphics/update-drawables.sh
+++ b/Graphics/update-drawables.sh
@@ -10,17 +10,6 @@ XXXDPI_DIR=$APP_DIR/res/drawable-xxxhdpi
PLAY_DIR=./drawables/
SRC_DIR=./drawables/
-
-
-# Launcher Icon:
-# -----------------------
-# mdpi: 48x48
-# hdpi: 72x72
-# xhdpi: 96x96
-# xxhdpi: 144x144.
-# xxxhdpi 192x192.
-# google play: 512x512
-
# Adobe Illustrator (.ai) exports by Tha Phlash are way better than the Inkscape exports (.svg)
#NAME="ic_launcher"
@@ -32,38 +21,24 @@ SRC_DIR=./drawables/
#inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg
#inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
-# Actionbar Icons
-# -----------------------
-# mdpi: 32x32
-# hdpi: 48x48
-# xhdpi: 64x64
-# xxhdpi: 96x96
-
-for NAME in "ic_action_search_cloud" "ic_cloud_search_24px" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout"
-do
-echo $NAME
-inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 48 -h 48 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-done
-for NAME in "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign"
+for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign"
do
echo $NAME
-inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 36 -h 36 -e "$HDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 72 -h 72 -e "$XXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 96 -h 96 -e "$XXXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
done
for NAME in "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout"
do
echo $NAME
-inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 128 -h 128 -e "$HDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 192 -h 192 -e "$XDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 256 -h 256 -e "$XXDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 128 -h 128 -e "$HDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 192 -h 192 -e "$XDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg"
+inkscape -w 256 -h 256 -e "$XXDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg"
done
for NAME in "create_key_robot"
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file_24dp.png
new file mode 100644
index 000000000..944a99199
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text_24dp.png
new file mode 100644
index 000000000..9166133b1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png
deleted file mode 100644
index 790af372d..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout_24dp.png
new file mode 100644
index 000000000..56bd81589
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24dp.png
new file mode 100644
index 000000000..6f8c72cd6
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_key_plus_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..af3bc9d05
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24dp.png
new file mode 100644
index 000000000..8ca38976f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png
deleted file mode 100644
index 9d4ed6e84..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24dp.png
new file mode 100644
index 000000000..32a8a5df7
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png
deleted file mode 100644
index e76393659..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24dp.png
new file mode 100644
index 000000000..ee330eaf3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png
deleted file mode 100644
index 3c2f8c09c..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24dp.png
new file mode 100644
index 000000000..925b4b9b0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png
deleted file mode 100644
index 046424643..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24dp.png
new file mode 100644
index 000000000..350268538
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png
deleted file mode 100644
index a1b090630..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24dp.png
new file mode 100644
index 000000000..a615c93a0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png
deleted file mode 100644
index e567055aa..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24dp.png
new file mode 100644
index 000000000..0fbe18533
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png
deleted file mode 100644
index 98e32eadc..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24dp.png
new file mode 100644
index 000000000..f7f296b69
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png
deleted file mode 100644
index 84ac9bec2..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96dp.png
index 63546068f..63546068f 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24dp.png
new file mode 100644
index 000000000..d27b1841d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png
deleted file mode 100644
index 967e00e80..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96dp.png
index 9957db288..9957db288 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24dp.png
new file mode 100644
index 000000000..82799481a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png
deleted file mode 100644
index 244dd0708..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96dp.png
index 1c3a15c07..1c3a15c07 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24dp.png
new file mode 100644
index 000000000..919ffd1d3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png
deleted file mode 100644
index 82cc25a4b..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96dp.png
index ce46c6317..ce46c6317 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24dp.png
new file mode 100644
index 000000000..825322dc7
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png
deleted file mode 100644
index e752eaeab..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96dp.png
index 19ee3c241..19ee3c241 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24dp.png
new file mode 100644
index 000000000..5a6e68b5f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png
deleted file mode 100644
index 08a9f464c..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96dp.png
index ed3db0aca..ed3db0aca 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file_24dp.png
new file mode 100644
index 000000000..a1500ff3d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text_24dp.png
new file mode 100644
index 000000000..4a7f53d97
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png
deleted file mode 100644
index 69c801dcc..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout_24dp.png
new file mode 100644
index 000000000..c94877886
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24dp.png
new file mode 100644
index 000000000..eceece7ca
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png
deleted file mode 100644
index 7a69993fd..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_key_plus_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..6a9b6a9fe
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24dp.png
index ed1ba24d2..ed1ba24d2 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24dp.png
index d54d461fa..d54d461fa 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24dp.png
index 81c1b3dfa..81c1b3dfa 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24dp.png
index 9afc43901..9afc43901 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24dp.png
index cfc39f0e7..cfc39f0e7 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24dp.png
index 824dc2672..824dc2672 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24dp.png
index 9bca59ae3..9bca59ae3 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24dp.png
index bc91094b5..bc91094b5 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96dp.png
index df385bb1b..df385bb1b 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24dp.png
index bc2f56e2a..bc2f56e2a 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96dp.png
index aeb899599..aeb899599 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24dp.png
index 2d2593194..2d2593194 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96dp.png
index d77c5e1c1..d77c5e1c1 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24dp.png
index 0fc74d07e..0fc74d07e 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96dp.png
index ee0661234..ee0661234 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24dp.png
index 96a2d1413..96a2d1413 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96dp.png
index 1602747f1..1602747f1 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24dp.png
index 9f7cf837c..9f7cf837c 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96dp.png
index 61c23f749..61c23f749 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file_24dp.png
new file mode 100644
index 000000000..1e397ebed
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text_24dp.png
new file mode 100644
index 000000000..1cbd993a7
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png
deleted file mode 100644
index c6dfd0bcb..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout_24dp.png
new file mode 100644
index 000000000..896aca575
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24dp.png
index 6f9b343ad..6f9b343ad 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png
deleted file mode 100644
index 1f0db264a..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_key_plus_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..144e82989
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24dp.png
index 8d36d7202..8d36d7202 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24dp.png
index 01a74bcc0..01a74bcc0 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24dp.png
index ff07bd0a4..ff07bd0a4 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24dp.png
index b8002162a..b8002162a 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24dp.png
index 7c6bb2d18..7c6bb2d18 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24dp.png
index da4a5d89a..da4a5d89a 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24dp.png
index cd02fc1e4..cd02fc1e4 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24dp.png
index 83f6fde35..83f6fde35 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png
index 568b48c43..568b48c43 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24dp.png
index 29830f5ba..29830f5ba 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96dp.png
index 89f899212..89f899212 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24dp.png
index 2f7695043..2f7695043 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96dp.png
index 3db663e2e..3db663e2e 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24dp.png
index 2ce28c7ca..2ce28c7ca 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96dp.png
index 4e0e04375..4e0e04375 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24dp.png
index 442c55eee..442c55eee 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96dp.png
index 0b2ccc9f7..0b2ccc9f7 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24dp.png
index 160ec7cbe..160ec7cbe 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96dp.png
index 471e5e513..471e5e513 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file_24dp.png
new file mode 100644
index 000000000..8202a612d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text_24dp.png
new file mode 100644
index 000000000..66b115713
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png
deleted file mode 100644
index 38589ba0e..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout_24dp.png
new file mode 100644
index 000000000..3858675e3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24dp.png
new file mode 100644
index 000000000..a0924d025
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_key_plus_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..e0999bd81
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24dp.png
new file mode 100644
index 000000000..29be2882d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png
deleted file mode 100644
index d786dc72f..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24dp.png
new file mode 100644
index 000000000..671fb88c3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png
deleted file mode 100644
index 4bb97f992..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24dp.png
new file mode 100644
index 000000000..063736684
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png
deleted file mode 100644
index fe0c8e41b..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24dp.png
new file mode 100644
index 000000000..2b156e46a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png
deleted file mode 100644
index 51ab367a9..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24dp.png
new file mode 100644
index 000000000..67b3b0769
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png
deleted file mode 100644
index 5a9664d59..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24dp.png
new file mode 100644
index 000000000..032602f70
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png
deleted file mode 100644
index 608f065af..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24dp.png
new file mode 100644
index 000000000..b15100f6a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png
deleted file mode 100644
index ee34dd396..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24dp.png
new file mode 100644
index 000000000..e07f9d651
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png
deleted file mode 100644
index 33a3efed1..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96dp.png
index ba7e8c2f4..ba7e8c2f4 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24dp.png
new file mode 100644
index 000000000..8eaeba8d2
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png
deleted file mode 100644
index bc39d3496..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96dp.png
index 1fbf5ceb2..1fbf5ceb2 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24dp.png
new file mode 100644
index 000000000..d2d11e557
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png
deleted file mode 100644
index 58929661f..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96dp.png
index 338c696ac..338c696ac 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24dp.png
new file mode 100644
index 000000000..3b9684786
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png
deleted file mode 100644
index 3020357a4..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96dp.png
index 2690310a6..2690310a6 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24dp.png
new file mode 100644
index 000000000..4d0b4e796
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png
deleted file mode 100644
index 3829bb3a0..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96dp.png
index e559faf9d..e559faf9d 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24dp.png
new file mode 100644
index 000000000..12d43f635
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png
deleted file mode 100644
index 3548ee2b6..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96dp.png
index 79e4ec4a9..79e4ec4a9 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_file_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_file_24dp.png
new file mode 100644
index 000000000..c77329563
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_file_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_text_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_text_24dp.png
new file mode 100644
index 000000000..15650500d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_text_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_verified_cutout_24dp.png
new file mode 100644
index 000000000..49b13017c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_search_24dp.png
index 852cdc2a6..852cdc2a6 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_search_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png
new file mode 100644
index 000000000..e69e5732c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_authenticate_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_authenticate_24dp.png
new file mode 100644
index 000000000..438d9eb84
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_authenticate_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_certify_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_certify_24dp.png
new file mode 100644
index 000000000..6b6d6f46f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_certify_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_encrypt_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_encrypt_24dp.png
new file mode 100644
index 000000000..77c2e1911
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_encrypt_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_sign_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_sign_24dp.png
new file mode 100644
index 000000000..7ffa3aea2
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_sign_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_closed_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_closed_24dp.png
new file mode 100644
index 000000000..4116e13fa
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_closed_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_error_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_error_24dp.png
new file mode 100644
index 000000000..6053b7bec
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_error_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_open_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_open_24dp.png
new file mode 100644
index 000000000..67b4ae314
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_open_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_expired_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_expired_cutout_24dp.png
new file mode 100644
index 000000000..df385bb1b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_expired_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_invalid_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_invalid_cutout_24dp.png
new file mode 100644
index 000000000..aeb899599
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_invalid_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_revoked_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_revoked_cutout_24dp.png
new file mode 100644
index 000000000..d77c5e1c1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_revoked_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unknown_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unknown_cutout_24dp.png
new file mode 100644
index 000000000..ee0661234
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unknown_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unverified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unverified_cutout_24dp.png
new file mode 100644
index 000000000..1602747f1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unverified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_cutout_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_cutout_24dp.png
new file mode 100644
index 000000000..61c23f749
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_cutout_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index 784996c0d..f9a8e9933 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -79,7 +79,7 @@
android:layout_width="match_parent"
android:text="@string/api_settings_create_key"
android:layout_height="?android:attr/listPreferredItemHeight"
- android:drawableRight="@drawable/ic_action_new_account"
+ android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true" />
diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
index 2df3755a4..c1227f906 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
@@ -95,7 +95,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
- android:src="@drawable/status_signature_verified_cutout_24px"
+ android:src="@drawable/status_signature_verified_cutout_24dp"
android:layout_gravity="center_vertical" />
</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 9b6a807cb..84625d1fd 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -180,7 +180,7 @@
android:layout_weight="1"
android:text="@string/btn_create_key"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:drawableRight="@drawable/ic_action_new_account"
+ android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 659d1c207..7317e7742 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -24,7 +24,7 @@
android:id="@+id/result_encryption_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/status_lock_open_24px"
+ android:src="@drawable/status_lock_open_24dp"
android:layout_gravity="center_vertical" />
<TextView
@@ -47,7 +47,7 @@
android:id="@+id/result_signature_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/status_signature_unverified_cutout_24px"
+ android:src="@drawable/status_signature_unverified_cutout_24dp"
android:layout_gravity="center_vertical" />
<TextView
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index 9bd4e61c0..2a2dee32c 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -111,7 +111,7 @@
android:layout_height="match_parent"
android:text="@string/edit_key_action_add_subkey"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:drawableRight="@drawable/ic_action_new_account"
+ android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 443a7cde4..bab9e2e27 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -62,7 +62,7 @@
android:layout_weight="1"
android:text="@string/first_time_create_key"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:drawableRight="@drawable/ic_action_new_account"
+ android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
index bf9d33852..e0b19b608 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
@@ -73,7 +73,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/status_signature_revoked_cutout_24px"
+ android:src="@drawable/status_signature_revoked_cutout_24dp"
android:padding="16dp" />
<TextView
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 65935f9c8..ea3426f90 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -70,7 +70,7 @@
android:id="@+id/fab_add_cloud"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- fab:fab_icon="@drawable/ic_cloud_search_24px"
+ fab:fab_icon="@drawable/ic_cloud_search_24dp"
fab:fab_colorNormal="@color/primary"
fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Search Cloud"
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 27444a260..595dcd77b 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -69,7 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/status_signature_revoked_cutout_24px"
+ android:src="@drawable/status_signature_revoked_cutout_24dp"
android:padding="16dp" />
</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index 757dae5be..45147e7b1 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/status_signature_revoked_cutout_24px"
+ android:src="@drawable/status_signature_revoked_cutout_24dp"
android:paddingLeft="16dp"
android:paddingRight="16dp" />
diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml
index 13f63d2ee..e12892aae 100644
--- a/OpenKeychain/src/main/res/layout/select_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/select_key_item.xml
@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/status_signature_revoked_cutout_24px"
+ android:src="@drawable/status_signature_revoked_cutout_24dp"
android:paddingLeft="16dp"
android:paddingRight="16dp" />
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 314d93be8..4aa3bc448 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -120,7 +120,7 @@
android:id="@+id/view_key_status_image"
android:layout_width="96dp"
android:visibility="invisible"
- android:src="@drawable/status_signature_unverified_cutout_96px"
+ android:src="@drawable/status_signature_unverified_cutout_96dp"
android:layout_height="96dp"
android:layout_above="@id/toolbar2"
android:layout_alignParentRight="true"