diff --git a/Graphics/drawables/ic_cloud_search_24px.svg b/Graphics/drawables/ic_cloud_search.svg similarity index 100% rename from Graphics/drawables/ic_cloud_search_24px.svg rename to 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_black_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_grey600_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-hdpi/ic_key_plus_white_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_black_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_grey600_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-mdpi/ic_key_plus_white_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_black_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_grey600_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xhdpi/ic_key_plus_white_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_black_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_grey600_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxhdpi/ic_key_plus_white_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_black_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_grey600_48dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_18dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_24dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_36dp.png 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 Binary files /dev/null and b/Graphics/drawables/originals/key-plus/drawable-xxxhdpi/ic_key_plus_white_48dp.png 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 @@ + + + + \ 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" +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 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" -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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_key_plus_grey600_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_key_plus_grey600_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png and /dev/null 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24dp.png 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 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png and /dev/null 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_file_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_text_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_verified_cutout_24dp.png 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 similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png rename to OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_search_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_key_plus_grey600_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_authenticate_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_certify_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_encrypt_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/key_flag_sign_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_closed_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_error_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_lock_open_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_expired_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_invalid_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_revoked_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unknown_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_unverified_cutout_24dp.png 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 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_cutout_24dp.png 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" /> 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" /> 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"