diff --git a/images/drawables-pgp/status_dots_1.svg b/images/drawables-pgp/12x24/status_dots_1.svg
similarity index 100%
rename from images/drawables-pgp/status_dots_1.svg
rename to images/drawables-pgp/12x24/status_dots_1.svg
diff --git a/images/drawables-pgp/status_dots_2.svg b/images/drawables-pgp/12x24/status_dots_2.svg
similarity index 100%
rename from images/drawables-pgp/status_dots_2.svg
rename to images/drawables-pgp/12x24/status_dots_2.svg
diff --git a/images/drawables-pgp/status_dots_3.svg b/images/drawables-pgp/12x24/status_dots_3.svg
similarity index 100%
rename from images/drawables-pgp/status_dots_3.svg
rename to images/drawables-pgp/12x24/status_dots_3.svg
diff --git a/images/drawables-pgp/bullet_point_negative.svg b/images/drawables-pgp/24x24/bullet_point_negative.svg
similarity index 100%
rename from images/drawables-pgp/bullet_point_negative.svg
rename to images/drawables-pgp/24x24/bullet_point_negative.svg
diff --git a/images/drawables-pgp/bullet_point_positive.svg b/images/drawables-pgp/24x24/bullet_point_positive.svg
similarity index 100%
rename from images/drawables-pgp/bullet_point_positive.svg
rename to images/drawables-pgp/24x24/bullet_point_positive.svg
diff --git a/images/drawables-pgp/compatibility.svg b/images/drawables-pgp/24x24/compatibility.svg
similarity index 100%
rename from images/drawables-pgp/compatibility.svg
rename to images/drawables-pgp/24x24/compatibility.svg
diff --git a/images/drawables-pgp/status_lock.svg b/images/drawables-pgp/24x24/status_lock.svg
similarity index 100%
rename from images/drawables-pgp/status_lock.svg
rename to images/drawables-pgp/24x24/status_lock.svg
diff --git a/images/drawables-pgp/status_lock_closed.svg b/images/drawables-pgp/24x24/status_lock_closed.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_closed.svg
rename to images/drawables-pgp/24x24/status_lock_closed.svg
diff --git a/images/drawables-pgp/status_lock_disabled.svg b/images/drawables-pgp/24x24/status_lock_disabled.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_disabled.svg
rename to images/drawables-pgp/24x24/status_lock_disabled.svg
diff --git a/images/drawables-pgp/status_lock_error.svg b/images/drawables-pgp/24x24/status_lock_error.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_error.svg
rename to images/drawables-pgp/24x24/status_lock_error.svg
diff --git a/images/drawables-pgp/status_lock_open.svg b/images/drawables-pgp/24x24/status_lock_open.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_open.svg
rename to images/drawables-pgp/24x24/status_lock_open.svg
diff --git a/images/drawables-pgp/status_lock_opportunistic.svg b/images/drawables-pgp/24x24/status_lock_opportunistic.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_opportunistic.svg
rename to images/drawables-pgp/24x24/status_lock_opportunistic.svg
diff --git a/images/drawables-pgp/status_signature_expired_cutout.svg b/images/drawables-pgp/24x24/status_signature_expired_cutout.svg
similarity index 100%
rename from images/drawables-pgp/status_signature_expired_cutout.svg
rename to images/drawables-pgp/24x24/status_signature_expired_cutout.svg
diff --git a/images/drawables-pgp/status_signature_invalid_cutout.svg b/images/drawables-pgp/24x24/status_signature_invalid_cutout.svg
similarity index 100%
rename from images/drawables-pgp/status_signature_invalid_cutout.svg
rename to images/drawables-pgp/24x24/status_signature_invalid_cutout.svg
diff --git a/images/drawables-pgp/status_signature_revoked_cutout.svg b/images/drawables-pgp/24x24/status_signature_revoked_cutout.svg
similarity index 100%
rename from images/drawables-pgp/status_signature_revoked_cutout.svg
rename to images/drawables-pgp/24x24/status_signature_revoked_cutout.svg
diff --git a/images/drawables-pgp/status_signature_unknown_cutout.svg b/images/drawables-pgp/24x24/status_signature_unknown_cutout.svg
similarity index 100%
rename from images/drawables-pgp/status_signature_unknown_cutout.svg
rename to images/drawables-pgp/24x24/status_signature_unknown_cutout.svg
diff --git a/images/drawables-pgp/status_signature_unverified_cutout.svg b/images/drawables-pgp/24x24/status_signature_unverified_cutout.svg
similarity index 100%
rename from images/drawables-pgp/status_signature_unverified_cutout.svg
rename to images/drawables-pgp/24x24/status_signature_unverified_cutout.svg
diff --git a/images/drawables-pgp/status_signature_verified_cutout.svg b/images/drawables-pgp/24x24/status_signature_verified_cutout.svg
similarity index 100%
rename from images/drawables-pgp/status_signature_verified_cutout.svg
rename to images/drawables-pgp/24x24/status_signature_verified_cutout.svg
diff --git a/images/drawables-pgp/status_check_dots_1.svg b/images/drawables-pgp/36x24/status_check_dots_1.svg
similarity index 100%
rename from images/drawables-pgp/status_check_dots_1.svg
rename to images/drawables-pgp/36x24/status_check_dots_1.svg
diff --git a/images/drawables-pgp/status_check_dots_2.svg b/images/drawables-pgp/36x24/status_check_dots_2.svg
similarity index 100%
rename from images/drawables-pgp/status_check_dots_2.svg
rename to images/drawables-pgp/36x24/status_check_dots_2.svg
diff --git a/images/drawables-pgp/status_check_dots_3.svg b/images/drawables-pgp/36x24/status_check_dots_3.svg
similarity index 100%
rename from images/drawables-pgp/status_check_dots_3.svg
rename to images/drawables-pgp/36x24/status_check_dots_3.svg
diff --git a/images/drawables-pgp/status_dots.svg b/images/drawables-pgp/36x24/status_dots.svg
similarity index 100%
rename from images/drawables-pgp/status_dots.svg
rename to images/drawables-pgp/36x24/status_dots.svg
diff --git a/images/drawables-pgp/status_lock_disabled_dots_1.svg b/images/drawables-pgp/36x24/status_lock_disabled_dots_1.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_disabled_dots_1.svg
rename to images/drawables-pgp/36x24/status_lock_disabled_dots_1.svg
diff --git a/images/drawables-pgp/status_lock_dots_1.svg b/images/drawables-pgp/36x24/status_lock_dots_1.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_dots_1.svg
rename to images/drawables-pgp/36x24/status_lock_dots_1.svg
diff --git a/images/drawables-pgp/status_lock_dots_2.svg b/images/drawables-pgp/36x24/status_lock_dots_2.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_dots_2.svg
rename to images/drawables-pgp/36x24/status_lock_dots_2.svg
diff --git a/images/drawables-pgp/status_lock_dots_3.svg b/images/drawables-pgp/36x24/status_lock_dots_3.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_dots_3.svg
rename to images/drawables-pgp/36x24/status_lock_dots_3.svg
diff --git a/images/drawables-pgp/status_lock_error_dots_1.svg b/images/drawables-pgp/36x24/status_lock_error_dots_1.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_error_dots_1.svg
rename to images/drawables-pgp/36x24/status_lock_error_dots_1.svg
diff --git a/images/drawables-pgp/status_lock_none_dots_1.svg b/images/drawables-pgp/36x24/status_lock_none_dots_1.svg
similarity index 100%
rename from images/drawables-pgp/status_lock_none_dots_1.svg
rename to images/drawables-pgp/36x24/status_lock_none_dots_1.svg
diff --git a/images/drawables-pgp/status_none_dots_1.svg b/images/drawables-pgp/36x24/status_none_dots_1.svg
similarity index 100%
rename from images/drawables-pgp/status_none_dots_1.svg
rename to images/drawables-pgp/36x24/status_none_dots_1.svg
diff --git a/images/drawables-pgp/status_none_dots_2.svg b/images/drawables-pgp/36x24/status_none_dots_2.svg
similarity index 100%
rename from images/drawables-pgp/status_none_dots_2.svg
rename to images/drawables-pgp/36x24/status_none_dots_2.svg
diff --git a/images/drawables-pgp/status_none_dots_3.svg b/images/drawables-pgp/36x24/status_none_dots_3.svg
similarity index 100%
rename from images/drawables-pgp/status_none_dots_3.svg
rename to images/drawables-pgp/36x24/status_none_dots_3.svg
diff --git a/images/update-drawables-pgp.sh b/images/update-drawables-pgp.sh
deleted file mode 100755
index 501be2d56..000000000
--- a/images/update-drawables-pgp.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-APP_DIR=../k9mail/src/main
-MDPI_DIR=$APP_DIR/res/drawable-mdpi
-HDPI_DIR=$APP_DIR/res/drawable-hdpi
-XDPI_DIR=$APP_DIR/res/drawable-xhdpi
-XXDPI_DIR=$APP_DIR/res/drawable-xxhdpi
-XXXDPI_DIR=$APP_DIR/res/drawable-xxxhdpi
-SRC_DIR=./drawables-pgp/
-
-
-for NAME in "bullet_point_positive" "bullet_point_negative" "compatibility" "status_lock" "status_lock_closed" "status_lock_error" "status_lock_open" "status_lock_disabled" "status_lock_opportunistic" "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 24 -h 24 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 32 -h 32 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 48 -h 48 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 64 -h 64 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-done
-
-for NAME in "status_none_dots_1" "status_none_dots_2" "status_none_dots_3" "status_check_dots_1" "status_check_dots_1" "status_check_dots_3" "status_dots" "status_lock_none_dots_1" "status_lock_disabled_dots_1" "status_lock_dots_1" "status_lock_error_dots_1" "status_lock_dots_2" "status_lock_dots_3"
-do
-echo $NAME
-inkscape -w 36 -h 24 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 48 -h 32 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 72 -h 48 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 96 -h 64 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-done
-
-for NAME in "status_dots_1" "status_dots_2" "status_dots_3"
-do
-echo $NAME
-inkscape -w 12 -h 24 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 16 -h 32 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 24 -h 48 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-inkscape -w 32 -h 64 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
-done
diff --git a/k9mail/src/main/res/drawable-hdpi/bullet_point_negative.png b/k9mail/src/main/res/drawable-hdpi/bullet_point_negative.png
deleted file mode 100644
index bd8eb7b66..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/bullet_point_negative.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/bullet_point_positive.png b/k9mail/src/main/res/drawable-hdpi/bullet_point_positive.png
deleted file mode 100644
index 28ac58099..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/bullet_point_positive.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/compatibility.png b/k9mail/src/main/res/drawable-hdpi/compatibility.png
deleted file mode 100644
index 6b6552349..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/compatibility.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_check_dots_1.png b/k9mail/src/main/res/drawable-hdpi/status_check_dots_1.png
deleted file mode 100644
index 38b3f8224..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_check_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_check_dots_2.png b/k9mail/src/main/res/drawable-hdpi/status_check_dots_2.png
deleted file mode 100644
index 0ee9807ba..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_check_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_check_dots_3.png b/k9mail/src/main/res/drawable-hdpi/status_check_dots_3.png
deleted file mode 100644
index 7e26de2b9..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_check_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_dots.png b/k9mail/src/main/res/drawable-hdpi/status_dots.png
deleted file mode 100644
index 487063a23..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_dots.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_dots_1.png b/k9mail/src/main/res/drawable-hdpi/status_dots_1.png
deleted file mode 100644
index 9c84c9f79..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_dots_2.png b/k9mail/src/main/res/drawable-hdpi/status_dots_2.png
deleted file mode 100644
index 9201bbea0..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_dots_3.png b/k9mail/src/main/res/drawable-hdpi/status_dots_3.png
deleted file mode 100644
index ed3f556f6..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock.png b/k9mail/src/main/res/drawable-hdpi/status_lock.png
deleted file mode 100644
index 436b569ee..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_closed.png b/k9mail/src/main/res/drawable-hdpi/status_lock_closed.png
deleted file mode 100644
index a1b090630..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_closed.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_disabled.png b/k9mail/src/main/res/drawable-hdpi/status_lock_disabled.png
deleted file mode 100644
index 2dadfc4d8..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_disabled.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_disabled_dots_1.png b/k9mail/src/main/res/drawable-hdpi/status_lock_disabled_dots_1.png
deleted file mode 100644
index e0b199315..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_disabled_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_dots_1.png b/k9mail/src/main/res/drawable-hdpi/status_lock_dots_1.png
deleted file mode 100644
index aedefb560..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_dots_2.png b/k9mail/src/main/res/drawable-hdpi/status_lock_dots_2.png
deleted file mode 100644
index e6b065490..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_dots_3.png b/k9mail/src/main/res/drawable-hdpi/status_lock_dots_3.png
deleted file mode 100644
index 92b04d5d0..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_error.png b/k9mail/src/main/res/drawable-hdpi/status_lock_error.png
deleted file mode 100644
index e567055aa..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_error.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_error_dots_1.png b/k9mail/src/main/res/drawable-hdpi/status_lock_error_dots_1.png
deleted file mode 100644
index 90e2af6f5..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_error_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_none_dots_1.png b/k9mail/src/main/res/drawable-hdpi/status_lock_none_dots_1.png
deleted file mode 100644
index e5973221b..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_open.png b/k9mail/src/main/res/drawable-hdpi/status_lock_open.png
deleted file mode 100644
index 98e32eadc..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_open.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_lock_opportunistic.png b/k9mail/src/main/res/drawable-hdpi/status_lock_opportunistic.png
deleted file mode 100644
index a5b550544..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_lock_opportunistic.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_none_dots_1.png b/k9mail/src/main/res/drawable-hdpi/status_none_dots_1.png
deleted file mode 100644
index e67f858e2..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_none_dots_2.png b/k9mail/src/main/res/drawable-hdpi/status_none_dots_2.png
deleted file mode 100644
index 3a4c7d022..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_none_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_none_dots_3.png b/k9mail/src/main/res/drawable-hdpi/status_none_dots_3.png
deleted file mode 100644
index 5f2c3db9f..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_none_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_signature_expired_cutout.png b/k9mail/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
deleted file mode 100644
index 84ac9bec2..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png b/k9mail/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index 967e00e80..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png b/k9mail/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 244dd0708..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png b/k9mail/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 82cc25a4b..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png b/k9mail/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index e752eaeab..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-hdpi/status_signature_verified_cutout.png b/k9mail/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 08a9f464c..000000000
Binary files a/k9mail/src/main/res/drawable-hdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/bullet_point_negative.png b/k9mail/src/main/res/drawable-mdpi/bullet_point_negative.png
deleted file mode 100644
index bc6861657..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/bullet_point_negative.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/bullet_point_positive.png b/k9mail/src/main/res/drawable-mdpi/bullet_point_positive.png
deleted file mode 100644
index c65c0b254..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/bullet_point_positive.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/compatibility.png b/k9mail/src/main/res/drawable-mdpi/compatibility.png
deleted file mode 100644
index bed9fd7a8..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/compatibility.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_check_dots_1.png b/k9mail/src/main/res/drawable-mdpi/status_check_dots_1.png
deleted file mode 100644
index 7cf2a0bed..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_check_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_check_dots_2.png b/k9mail/src/main/res/drawable-mdpi/status_check_dots_2.png
deleted file mode 100644
index c66629b83..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_check_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_check_dots_3.png b/k9mail/src/main/res/drawable-mdpi/status_check_dots_3.png
deleted file mode 100644
index 432782240..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_check_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_dots.png b/k9mail/src/main/res/drawable-mdpi/status_dots.png
deleted file mode 100644
index 601ff64fe..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_dots.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_dots_1.png b/k9mail/src/main/res/drawable-mdpi/status_dots_1.png
deleted file mode 100644
index 03519a75e..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_dots_2.png b/k9mail/src/main/res/drawable-mdpi/status_dots_2.png
deleted file mode 100644
index 983e909c2..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_dots_3.png b/k9mail/src/main/res/drawable-mdpi/status_dots_3.png
deleted file mode 100644
index 868c6df1a..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock.png b/k9mail/src/main/res/drawable-mdpi/status_lock.png
deleted file mode 100644
index 7ea08e5c3..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_closed.png b/k9mail/src/main/res/drawable-mdpi/status_lock_closed.png
deleted file mode 100644
index cfc39f0e7..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_closed.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_disabled.png b/k9mail/src/main/res/drawable-mdpi/status_lock_disabled.png
deleted file mode 100644
index 67ee11b2b..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_disabled.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_disabled_dots_1.png b/k9mail/src/main/res/drawable-mdpi/status_lock_disabled_dots_1.png
deleted file mode 100644
index 54144bb9d..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_disabled_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_dots_1.png b/k9mail/src/main/res/drawable-mdpi/status_lock_dots_1.png
deleted file mode 100644
index 599f2bb2f..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_dots_2.png b/k9mail/src/main/res/drawable-mdpi/status_lock_dots_2.png
deleted file mode 100644
index 7d21ad8b3..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_dots_3.png b/k9mail/src/main/res/drawable-mdpi/status_lock_dots_3.png
deleted file mode 100644
index 18a9553ec..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_error.png b/k9mail/src/main/res/drawable-mdpi/status_lock_error.png
deleted file mode 100644
index 824dc2672..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_error.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_error_dots_1.png b/k9mail/src/main/res/drawable-mdpi/status_lock_error_dots_1.png
deleted file mode 100644
index b7625c37a..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_error_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_none_dots_1.png b/k9mail/src/main/res/drawable-mdpi/status_lock_none_dots_1.png
deleted file mode 100644
index 2f85b3c91..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_open.png b/k9mail/src/main/res/drawable-mdpi/status_lock_open.png
deleted file mode 100644
index 9bca59ae3..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_open.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_lock_opportunistic.png b/k9mail/src/main/res/drawable-mdpi/status_lock_opportunistic.png
deleted file mode 100644
index bf688d76f..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_lock_opportunistic.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_none_dots_1.png b/k9mail/src/main/res/drawable-mdpi/status_none_dots_1.png
deleted file mode 100644
index 7e2d65ac1..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_none_dots_2.png b/k9mail/src/main/res/drawable-mdpi/status_none_dots_2.png
deleted file mode 100644
index 139411e70..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_none_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_none_dots_3.png b/k9mail/src/main/res/drawable-mdpi/status_none_dots_3.png
deleted file mode 100644
index 7e7028177..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_none_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/k9mail/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
deleted file mode 100644
index bc91094b5..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/k9mail/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index bc2f56e2a..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/k9mail/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 2d2593194..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/k9mail/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 0fc74d07e..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/k9mail/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index 96a2d1413..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/k9mail/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 9f7cf837c..000000000
Binary files a/k9mail/src/main/res/drawable-mdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/bullet_point_negative.png b/k9mail/src/main/res/drawable-xhdpi/bullet_point_negative.png
deleted file mode 100644
index 651beffa6..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/bullet_point_negative.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/bullet_point_positive.png b/k9mail/src/main/res/drawable-xhdpi/bullet_point_positive.png
deleted file mode 100644
index f164b378e..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/bullet_point_positive.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/compatibility.png b/k9mail/src/main/res/drawable-xhdpi/compatibility.png
deleted file mode 100644
index 669dabf6c..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/compatibility.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_check_dots_1.png b/k9mail/src/main/res/drawable-xhdpi/status_check_dots_1.png
deleted file mode 100644
index 8b15a5138..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_check_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_check_dots_2.png b/k9mail/src/main/res/drawable-xhdpi/status_check_dots_2.png
deleted file mode 100644
index f9fef389f..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_check_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_check_dots_3.png b/k9mail/src/main/res/drawable-xhdpi/status_check_dots_3.png
deleted file mode 100644
index 394193b7a..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_check_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_dots.png b/k9mail/src/main/res/drawable-xhdpi/status_dots.png
deleted file mode 100644
index 836a11c82..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_dots.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_dots_1.png b/k9mail/src/main/res/drawable-xhdpi/status_dots_1.png
deleted file mode 100644
index 5625f7e10..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_dots_2.png b/k9mail/src/main/res/drawable-xhdpi/status_dots_2.png
deleted file mode 100644
index d5cbdc6d2..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_dots_3.png b/k9mail/src/main/res/drawable-xhdpi/status_dots_3.png
deleted file mode 100644
index 5124eed98..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock.png b/k9mail/src/main/res/drawable-xhdpi/status_lock.png
deleted file mode 100644
index ad0ec4f78..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_closed.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_closed.png
deleted file mode 100644
index 7c6bb2d18..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_closed.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_disabled.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_disabled.png
deleted file mode 100644
index d7ba6c1eb..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_disabled.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_disabled_dots_1.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_disabled_dots_1.png
deleted file mode 100644
index 57fb3236c..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_disabled_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_1.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_1.png
deleted file mode 100644
index f0bae22f4..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_2.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_2.png
deleted file mode 100644
index 4c857486b..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_3.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_3.png
deleted file mode 100644
index e97d25be6..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_error.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_error.png
deleted file mode 100644
index da4a5d89a..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_error.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_error_dots_1.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_error_dots_1.png
deleted file mode 100644
index d506194ce..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_error_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_none_dots_1.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_none_dots_1.png
deleted file mode 100644
index 73398712e..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_open.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_open.png
deleted file mode 100644
index cd02fc1e4..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_open.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_lock_opportunistic.png b/k9mail/src/main/res/drawable-xhdpi/status_lock_opportunistic.png
deleted file mode 100644
index 22d457726..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_lock_opportunistic.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_none_dots_1.png b/k9mail/src/main/res/drawable-xhdpi/status_none_dots_1.png
deleted file mode 100644
index 654b3025c..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_none_dots_2.png b/k9mail/src/main/res/drawable-xhdpi/status_none_dots_2.png
deleted file mode 100644
index aa53d8daf..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_none_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_none_dots_3.png b/k9mail/src/main/res/drawable-xhdpi/status_none_dots_3.png
deleted file mode 100644
index 8043b232a..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_none_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png b/k9mail/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
deleted file mode 100644
index 83f6fde35..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png b/k9mail/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index 29830f5ba..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png b/k9mail/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 2f7695043..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png b/k9mail/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 2ce28c7ca..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png b/k9mail/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index 442c55eee..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png b/k9mail/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 160ec7cbe..000000000
Binary files a/k9mail/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/bullet_point_negative.png b/k9mail/src/main/res/drawable-xxhdpi/bullet_point_negative.png
deleted file mode 100644
index 089bf972a..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/bullet_point_negative.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/bullet_point_positive.png b/k9mail/src/main/res/drawable-xxhdpi/bullet_point_positive.png
deleted file mode 100644
index 0e3f48f9a..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/bullet_point_positive.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/compatibility.png b/k9mail/src/main/res/drawable-xxhdpi/compatibility.png
deleted file mode 100644
index 97bb639fe..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/compatibility.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_1.png b/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_1.png
deleted file mode 100644
index cf60c0284..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_2.png b/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_2.png
deleted file mode 100644
index cf3236ebf..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_3.png b/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_3.png
deleted file mode 100644
index b2c9e5696..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_check_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_dots.png b/k9mail/src/main/res/drawable-xxhdpi/status_dots.png
deleted file mode 100644
index 0e842709c..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_dots.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_dots_1.png b/k9mail/src/main/res/drawable-xxhdpi/status_dots_1.png
deleted file mode 100644
index 9b3425dd3..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_dots_2.png b/k9mail/src/main/res/drawable-xxhdpi/status_dots_2.png
deleted file mode 100644
index e4ff0b6ec..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_dots_3.png b/k9mail/src/main/res/drawable-xxhdpi/status_dots_3.png
deleted file mode 100644
index 07c2e3d3a..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock.png
deleted file mode 100644
index b76496c46..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_closed.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_closed.png
deleted file mode 100644
index 5a9664d59..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_closed.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_disabled.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_disabled.png
deleted file mode 100644
index d65223fa7..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_disabled.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_disabled_dots_1.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_disabled_dots_1.png
deleted file mode 100644
index a1be2656a..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_disabled_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_1.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_1.png
deleted file mode 100644
index f0b97bd82..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_2.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_2.png
deleted file mode 100644
index 3f33ae753..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_3.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_3.png
deleted file mode 100644
index 8abf69026..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_error.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_error.png
deleted file mode 100644
index 608f065af..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_error.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_error_dots_1.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_error_dots_1.png
deleted file mode 100644
index 1416039a8..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_error_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_none_dots_1.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_none_dots_1.png
deleted file mode 100644
index 0dd74e256..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_open.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_open.png
deleted file mode 100644
index ee34dd396..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_open.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_lock_opportunistic.png b/k9mail/src/main/res/drawable-xxhdpi/status_lock_opportunistic.png
deleted file mode 100644
index 50c5726d7..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_lock_opportunistic.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_1.png b/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_1.png
deleted file mode 100644
index 77758f9f6..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_1.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_2.png b/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_2.png
deleted file mode 100644
index d4cdb2d2e..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_2.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_3.png b/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_3.png
deleted file mode 100644
index 60e780a3c..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_none_dots_3.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png b/k9mail/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
deleted file mode 100644
index 33a3efed1..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png b/k9mail/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index bc39d3496..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png b/k9mail/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 58929661f..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png b/k9mail/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 3020357a4..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png b/k9mail/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index 3829bb3a0..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png b/k9mail/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 3548ee2b6..000000000
Binary files a/k9mail/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/k9mail/src/main/res/drawable/bullet_point_negative.xml b/k9mail/src/main/res/drawable/bullet_point_negative.xml
new file mode 100644
index 000000000..fed62836b
--- /dev/null
+++ b/k9mail/src/main/res/drawable/bullet_point_negative.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="457.469"
+    android:viewportWidth="457.47" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M228.7,96.9C155.9,96.9 96.9,155.9 96.9,228.7 96.9,301.5 155.9,360.5 228.7,360.5 301.5,360.5 360.5,301.5 360.5,228.7 360.5,155.9 301.5,96.9 228.7,96.9zM304,249.9 L157,249.9c-9.6,0 -17.4,-7.8 -17.4,-17.4 0,-9.6 7.8,-17.4 17.4,-17.4l147,0c9.6,0 17.4,7.8 17.4,17.4 0,9.6 -7.8,17.4 -17.4,17.4z"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/bullet_point_positive.xml b/k9mail/src/main/res/drawable/bullet_point_positive.xml
new file mode 100644
index 000000000..4f95bda4d
--- /dev/null
+++ b/k9mail/src/main/res/drawable/bullet_point_positive.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="457.469"
+    android:viewportWidth="457.47" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M228.7,96.9C155.9,96.9 96.9,155.9 96.9,228.7 96.9,301.5 155.9,360.5 228.7,360.5 301.5,360.5 360.5,301.5 360.5,228.7 360.5,155.9 301.5,96.9 228.7,96.9zM304,249.9l-56.1,0l0,56.1c0,9.6 -7.8,17.4 -17.4,17.4 -9.6,0 -17.4,-7.8 -17.4,-17.4l0,-56.1l-56.1,0c-9.6,0 -17.4,-7.8 -17.4,-17.4 0,-9.6 7.8,-17.4 17.4,-17.4l56.1,0l0,-56.1c0,-9.6 7.8,-17.4 17.4,-17.4 9.6,0 17.4,7.8 17.4,17.4l0,56.1l56.1,0c9.6,0 17.4,7.8 17.4,17.4 0,9.6 -7.8,17.4 -17.4,17.4z"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/compatibility.xml b/k9mail/src/main/res/drawable/compatibility.xml
new file mode 100644
index 000000000..8abc9d9d0
--- /dev/null
+++ b/k9mail/src/main/res/drawable/compatibility.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m17.73,12.02 l3.98,-3.98c0.39,-0.39 0.39,-1.02 0,-1.41L17.37,2.29C16.98,1.9 16.35,1.9 15.96,2.29L11.98,6.27 8,2.29C7.8,2.1 7.55,2 7.29,2 7.04,2 6.78,2.1 6.59,2.29L2.25,6.63c-0.39,0.39 -0.39,1.02 0,1.41L6.23,12.02 2.25,16c-0.39,0.39 -0.39,1.02 0,1.41l4.34,4.34c0.39,0.39 1.02,0.39 1.41,0l3.98,-3.98 3.98,3.98c0.2,0.2 0.45,0.29 0.71,0.29 0.26,0 0.51,-0.1 0.71,-0.29l4.34,-4.34c0.39,-0.39 0.39,-1.02 0,-1.41L17.73,12.02zM12,9c0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1zM7.29,10.96 L3.66,7.34 7.29,3.71 10.91,7.33 7.29,10.96zM10,13c-0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1zM12,15c-0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1zM14,11c0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1zM16.66,20.34 L13.03,16.72 16.66,13.09 20.28,16.71 16.66,20.34z"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_dots.xml b/k9mail/src/main/res/drawable/status_dots.xml
new file mode 100644
index 000000000..0a66f89f0
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_dots.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M121.43,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_dots_1.xml b/k9mail/src/main/res/drawable/status_dots_1.xml
new file mode 100644
index 000000000..b4cf0d065
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_dots_1.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="49.999996" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M25,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M25,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M25,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_dots_2.xml b/k9mail/src/main/res/drawable/status_dots_2.xml
new file mode 100644
index 000000000..ebb4133cd
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_dots_2.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="49.999996" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M25,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M25,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M25,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_dots_3.xml b/k9mail/src/main/res/drawable/status_dots_3.xml
new file mode 100644
index 000000000..fe2e3915d
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_dots_3.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="49.999996" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M25,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M25,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M25,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock.xml b/k9mail/src/main/res/drawable/status_lock.xml
new file mode 100644
index 000000000..4d19d5e15
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="m81.5,45.13 l-1.92,0 0,-15.65C79.48,10.28 66.39,-0.16 50.48,-0.16 34.57,-0.16 20.3,10.78 20.8,29.48l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.22,0 9.15,-0.99 9.15,-9.94l0,-35.33c0,-8.45 -8.45,-9.43 -8.68,-9.43zM34.26,45.13 L34.28,29.69c0,-9.95 6.07,-17.9 15.91,-17.9 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -31.84,0z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_closed.xml b/k9mail/src/main/res/drawable/status_lock_closed.xml
new file mode 100644
index 000000000..ed00fde5b
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_closed.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M5.33,25.93C4.73,24.54 5.42,20.26 6.61,18.57C7.8,16.88 14.92,11.11 18.19,9.52C21.46,7.93 25.23,10.71 25.23,10.71L31.28,18.57C21.77,21.75 12.36,33.89 12.36,33.89C12.36,33.89 5.92,27.33 5.33,25.93ZM50.91,98C30.67,98 14.27,81.39 14.27,60.91C14.27,41.41 29.15,25.45 48.05,23.97L48.05,18.33L41.74,18.33L41.74,9.03L59.37,9.03L59.37,18.33L53.76,18.33L53.76,23.97C72.66,25.44 87.54,41.41 87.54,60.91C87.54,81.38 71.14,98 50.91,98ZM51.65,71.69C57.76,71.69 62.72,66.75 62.72,60.64C62.72,54.54 57.76,49.59 51.65,49.59C45.54,49.59 40.58,54.54 40.58,60.64C40.58,66.75 45.54,71.69 51.65,71.69ZM96.49,25.93C95.89,27.33 89.45,33.89 89.45,33.89C89.45,33.89 80.04,21.75 70.53,18.58L76.58,10.72C76.58,10.72 80.35,7.93 83.62,9.52C86.89,11.12 94.01,16.88 95.2,18.58C96.39,20.26 97.08,24.54 96.49,25.93Z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_disabled.xml b/k9mail/src/main/res/drawable/status_lock_disabled.xml
new file mode 100644
index 000000000..c07500d1d
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_disabled.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M50.48,-0.16C39.1,-0.16 28.58,5.44 23.69,15.47L34.51,26.48C35.67,18.09 41.43,11.78 50.18,11.78C59.92,11.78 66.09,18.74 66.09,29.69L66.1,45.13L52.83,45.13L90.18,83.16L90.18,54.56C90.18,46.11 81.73,45.13 81.5,45.13L79.58,45.13L79.58,29.48C79.48,10.28 66.39,-0.16 50.48,-0.16zM20.8,27.68C20.79,28.27 20.78,28.87 20.8,29.48L20.79,45.11C20.79,45.11 21.02,45.13 19.82,45.13C18.55,45.13 10.19,46.61 10.19,54.07L10.19,89.89C10.19,97.85 19.6,99.84 19.82,99.84L81.03,99.84C81.19,99.84 85.92,99.3 88.51,95.59L38.2,45.13L34.26,45.13L34.27,41.19L20.8,27.68z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="m9.99,20.47 l4.79,-4.41 79.06,80.48 -4.01,4.01z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_disabled_dots_1.xml b/k9mail/src/main/res/drawable/status_lock_disabled_dots_1.xml
new file mode 100644
index 000000000..c96eb7217
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_disabled_dots_1.xml
@@ -0,0 +1,8 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#FF000000" android:pathData="m50.48,0c-11.37,0 -21.89,5.61 -26.79,15.63l10.82,11.01c1.17,-8.4 6.92,-14.7 15.68,-14.7 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -13.27,0 37.36,38.03 0,-28.6c0,-8.45 -8.45,-9.43 -8.68,-9.43l-1.93,0 0,-15.65C79.48,10.45 66.39,0 50.48,0zM20.8,27.85c-0.01,0.59 -0.02,1.19 0,1.8l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.16,0 4.89,-0.54 7.48,-4.24l-50.31,-50.46 -3.94,0 0,-3.95L20.8,27.85z"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_dots_2.xml b/k9mail/src/main/res/drawable/status_lock_dots_2.xml
new file mode 100644
index 000000000..bb155f30d
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_dots_2.xml
@@ -0,0 +1,13 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#000000"
+        android:pathData="m81.5,45.3 l-1.92,0 0,-15.65C79.48,10.45 66.39,-0 50.48,-0 34.57,-0 20.3,10.95 20.8,29.64l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.22,0 9.15,-0.99 9.15,-9.94l0,-35.33c0,-8.45 -8.45,-9.43 -8.68,-9.43zM34.26,45.3 L34.28,29.85c0,-9.95 6.07,-17.9 15.91,-17.9 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -31.84,0z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_dots_3.xml b/k9mail/src/main/res/drawable/status_lock_dots_3.xml
new file mode 100644
index 000000000..f237cc974
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_dots_3.xml
@@ -0,0 +1,17 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#000000"
+        android:pathData="m81.5,45.3 l-1.92,0 0,-15.65C79.48,10.45 66.39,-0 50.48,-0 34.57,-0 20.3,10.95 20.8,29.64l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.22,0 9.15,-0.99 9.15,-9.94l0,-35.33c0,-8.45 -8.45,-9.43 -8.68,-9.43zM34.26,45.3 L34.28,29.85c0,-9.95 6.07,-17.9 15.91,-17.9 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -31.84,0z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_error.xml b/k9mail/src/main/res/drawable/status_lock_error.xml
new file mode 100644
index 000000000..d5ed073de
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_error.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M80.46,45.47L78.53,45.47L78.53,29.83C78.43,10.63 65.34,0.18 49.43,0.18C33.53,0.18 19.26,11.13 19.76,29.83L19.75,45.45C19.75,45.45 19.99,45.47 18.78,45.47C17.51,45.47 9.15,46.95 9.15,54.41L9.15,90.23C9.15,98.19 18.57,100.17 18.78,100.17L79.98,100.17C80.2,100.17 89.14,99.18 89.14,90.23L89.14,54.9C89.14,46.45 80.68,45.47 80.46,45.47L80.46,45.47ZM33.23,30.03C33.23,20.08 39.3,12.13 49.14,12.13C58.88,12.13 65.04,19.09 65.04,30.03L65.06,45.47L33.22,45.47L33.23,30.03L33.23,30.03ZM59.4,90.87L48.46,79.93L38.23,90.36L31.64,83.76L42.58,72.82L32.34,62.59L38.75,56.11L49.7,67.05L60.12,56.71L66.64,63.22L55.69,74.17L66.01,84.48L59.4,90.87Z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_error_dots_1.xml b/k9mail/src/main/res/drawable/status_lock_error_dots_1.xml
new file mode 100644
index 000000000..6751357c0
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_error_dots_1.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillColor="#000000"
+        android:pathData="m81.5,45.3 l-1.93,0 0,-15.65C79.48,10.46 66.38,0.01 50.47,0.01 34.57,0.01 20.31,10.96 20.8,29.65l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.93l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.22,0 9.15,-0.99 9.15,-9.94l0,-35.33c0,-8.45 -8.45,-9.43 -8.68,-9.43l0,0zM34.27,29.86c0,-9.95 6.07,-17.9 15.91,-17.9 9.74,0 15.9,6.96 15.9,17.9l0.01,15.44 -31.84,0 0.02,-15.44 0,0zM60.44,90.7 L49.5,79.76 39.27,90.19 32.68,83.59 43.62,72.64 33.38,62.42 39.8,55.94 50.74,66.88 61.16,56.54 67.68,63.05 56.73,74 67.05,84.31 60.44,90.7z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_none_dots_1.xml b/k9mail/src/main/res/drawable/status_lock_none_dots_1.xml
new file mode 100644
index 000000000..20cda1132
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_none_dots_1.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_lock_opportunistic.xml b/k9mail/src/main/res/drawable/status_lock_opportunistic.xml
new file mode 100644
index 000000000..35d6767d9
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_lock_opportunistic.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M50.48,-0.16C34.57,-0.16 20.3,10.78 20.8,29.48L20.79,45.11C20.79,45.11 21.02,45.13 19.82,45.13C18.55,45.13 10.19,46.61 10.19,54.07L10.19,89.89C10.19,97.85 19.6,99.84 19.82,99.84L81.03,99.84C81.25,99.84 90.18,98.84 90.18,89.89L90.18,54.56C90.18,46.11 81.73,45.13 81.5,45.13L79.58,45.13L79.58,29.48C79.48,10.28 66.39,-0.16 50.48,-0.16zM50.18,11.78C59.92,11.78 66.09,18.74 66.09,29.69L66.1,45.13L34.26,45.13L34.28,29.69C34.28,19.74 40.35,11.78 50.18,11.78zM50.02,51.68C52.58,51.68 54.71,52.04 56.42,52.76C58.13,53.47 59.51,54.36 60.55,55.43C61.6,56.49 62.34,57.64 62.79,58.87C63.24,60.1 63.47,61.25 63.47,62.31C63.47,64.07 63.24,65.52 62.79,66.66C62.34,67.8 61.78,68.77 61.12,69.58C60.45,70.39 59.71,71.08 58.9,71.64C58.09,72.21 57.33,72.78 56.61,73.35C55.89,73.92 55.25,74.57 54.69,75.3C54.13,76.04 53.78,76.96 53.64,78.06L53.64,80.15L46.35,80.15L46.35,77.67C46.46,76.1 46.75,74.77 47.24,73.71C47.73,72.65 48.29,71.74 48.94,70.98C49.59,70.23 50.27,69.58 50.99,69.03C51.71,68.48 52.38,67.93 52.99,67.38C53.6,66.83 54.1,66.22 54.48,65.56C54.85,64.9 55.02,64.07 54.99,63.08C54.99,61.4 54.58,60.15 53.77,59.34C52.96,58.53 51.84,58.13 50.4,58.13C49.43,58.13 48.59,58.32 47.89,58.71C47.19,59.09 46.61,59.61 46.16,60.25C45.71,60.89 45.38,61.64 45.16,62.5C44.94,63.37 44.84,64.29 44.84,65.29L36.9,65.29C36.93,63.3 37.27,61.49 37.9,59.83C38.53,58.18 39.41,56.75 40.54,55.54C41.68,54.33 43.05,53.38 44.65,52.7C46.25,52.02 48.04,51.68 50.02,51.68zM45.76,83.31L53.98,83.31L53.98,91.54L45.76,91.54L45.76,83.31z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_none_dots_1.xml b/k9mail/src/main/res/drawable/status_none_dots_1.xml
new file mode 100644
index 000000000..20cda1132
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_none_dots_1.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_none_dots_2.xml b/k9mail/src/main/res/drawable/status_none_dots_2.xml
new file mode 100644
index 000000000..d2ab18dd7
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_none_dots_2.xml
@@ -0,0 +1,11 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_none_dots_3.xml b/k9mail/src/main/res/drawable/status_none_dots_3.xml
new file mode 100644
index 000000000..f2edc6b02
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_none_dots_3.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+    <path android:fillAlpha="1" android:fillColor="#000000"
+        android:pathData="M121.43,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
+        android:strokeAlpha="1" android:strokeColor="#000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_signature_unverified_cutout.xml b/k9mail/src/main/res/drawable/status_signature_unverified_cutout.xml
new file mode 100644
index 000000000..7653ab3e5
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_signature_unverified_cutout.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="101.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M50.81,96.55C76.76,96.55 97.81,75.51 97.81,49.55C97.81,23.59 76.76,2.55 50.81,2.55C24.85,2.55 3.81,23.59 3.81,49.55C3.81,75.51 24.85,96.55 50.81,96.55ZM43.83,79.43L43.83,67.01L56.25,67.01L56.25,79.43L43.83,79.43ZM69.57,41.86C68.89,43.58 68.05,45.05 67.04,46.27C66.03,47.49 64.92,48.53 63.7,49.39C62.47,50.25 61.32,51.11 60.23,51.97C59.14,52.83 58.18,53.81 57.33,54.92C56.49,56.03 55.96,57.41 55.74,59.08L55.74,62.24L44.73,62.24L44.73,58.5C44.9,56.11 45.34,54.12 46.08,52.51C46.81,50.9 47.67,49.53 48.65,48.39C49.63,47.26 50.66,46.27 51.75,45.44C52.83,44.61 53.84,43.78 54.76,42.95C55.69,42.11 56.44,41.2 57.01,40.2C57.58,39.2 57.83,37.96 57.78,36.46C57.78,33.91 57.17,32.03 55.95,30.8C54.72,29.59 53.02,28.98 50.85,28.98C49.38,28.98 48.12,29.27 47.05,29.85C46,30.43 45.12,31.21 44.45,32.18C43.76,33.15 43.26,34.28 42.94,35.59C42.61,36.89 42.45,38.29 42.45,39.79L30.46,39.79C30.51,36.79 31.02,34.05 31.97,31.55C32.92,29.06 34.25,26.9 35.96,25.07C37.68,23.24 39.74,21.81 42.16,20.78C44.58,19.76 47.29,19.24 50.28,19.24C54.14,19.24 57.36,19.79 59.94,20.87C62.52,21.95 64.61,23.29 66.18,24.9C67.76,26.51 68.89,28.24 69.57,30.1C70.25,31.96 70.59,33.69 70.59,35.3C70.59,37.96 70.25,40.15 69.57,41.86Z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/k9mail/src/main/res/drawable/status_signature_verified_cutout.xml b/k9mail/src/main/res/drawable/status_signature_verified_cutout.xml
new file mode 100644
index 000000000..142aac33a
--- /dev/null
+++ b/k9mail/src/main/res/drawable/status_signature_verified_cutout.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="100.0"
+    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M50.11,97C76.07,97 97.11,75.96 97.11,50C97.11,24.04 76.07,3 50.11,3C24.15,3 3.11,24.04 3.11,50C3.11,75.96 24.15,97 50.11,97ZM46.38,77.51L20.11,57.83L28.03,47.63L43.42,59.52L70.42,23L80.98,30.78L46.38,77.51Z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>