Fix resource names, add small test

77 files changed, 12 insertions, 7 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 5ace66f79..e44708c42 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -437,7 +438,7 @@ public class KeyListFragment extends LoaderFragment
             TextView mMainUserIdRest;
             FrameLayout mStatusLayout;
             TextView mRevoked;
-            ImageView mVerified;
+            ImageView mStatus;
         }
 
         @Override
@@ -448,7 +449,7 @@ public class KeyListFragment extends LoaderFragment
             holder.mMainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
             holder.mStatusLayout = (FrameLayout) view.findViewById(R.id.status_layout);
             holder.mRevoked = (TextView) view.findViewById(R.id.revoked);
-            holder.mVerified = (ImageView) view.findViewById(R.id.verified);
+            holder.mStatus = (ImageView) view.findViewById(R.id.status_image);
             view.setTag(holder);
             return view;
         }
@@ -486,7 +487,7 @@ public class KeyListFragment extends LoaderFragment
                     // this is a secret key
                     h.mStatusLayout.setVisibility(View.VISIBLE);
                     h.mRevoked.setVisibility(View.GONE);
-                    h.mVerified.setVisibility(View.GONE);
+                    h.mStatus.setVisibility(View.GONE);
                 } else {
                     // this is a public key - show if it's revoked
 
@@ -496,13 +497,17 @@ public class KeyListFragment extends LoaderFragment
                     if(isRevoked || isExpired) {
                         h.mStatusLayout.setVisibility(View.VISIBLE);
                         h.mRevoked.setVisibility(View.VISIBLE);
-                        h.mVerified.setVisibility(View.GONE);
+                        h.mStatus.setVisibility(View.GONE);
                         h.mRevoked.setText(isRevoked ? R.string.revoked : R.string.expired);
                     } else {
                         boolean isVerified = cursor.getInt(INDEX_VERIFIED) > 0;
                         h.mStatusLayout.setVisibility(isVerified ? View.VISIBLE : View.GONE);
                         h.mRevoked.setVisibility(View.GONE);
-                        h.mVerified.setVisibility(isVerified ? View.VISIBLE : View.GONE);
+                        h.mStatus.setVisibility(isVerified ? View.VISIBLE : View.GONE);
+                        if (isVerified) {
+                            h.mStatus.setColorFilter(getResources().getColor(R.color.result_green),
+                                    PorterDuff.Mode.MULTIPLY);
+                        }
                     }
                 }
             }
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
index 7c6bb2d18..7c6bb2d18 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
index da4a5d89a..da4a5d89a 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
index cd02fc1e4..cd02fc1e4 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png
index f5105c1ae..f5105c1ae 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
index 83f6fde35..83f6fde35 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png
index 67880d6db..67880d6db 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
index 29830f5ba..29830f5ba 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png
index 2ed67419b..2ed67419b 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
index 2f7695043..2f7695043 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png
index a6f1f2792..a6f1f2792 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
index 2ce28c7ca..2ce28c7ca 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png
index c25a84b4d..c25a84b4d 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
index 442c55eee..442c55eee 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png
index 6f435a85e..6f435a85e 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
index 160ec7cbe..160ec7cbe 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
index a1b090630..a1b090630 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
index e567055aa..e567055aa 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
index 98e32eadc..98e32eadc 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
index 21e8b536a..21e8b536a 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
index 84ac9bec2..84ac9bec2 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
index 9ae2a09ab..9ae2a09ab 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
index 967e00e80..967e00e80 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
index 16e1d7181..16e1d7181 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
index 244dd0708..244dd0708 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
index 5c3ba866d..5c3ba866d 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
index 82cc25a4b..82cc25a4b 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
index b8b472a5a..b8b472a5a 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
index e752eaeab..e752eaeab 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
index d8141b47b..d8141b47b 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
index 08a9f464c..08a9f464c 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png
index 5a9664d59..5a9664d59 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png
index 608f065af..608f065af 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png
index ee34dd396..ee34dd396 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png
index f475c9d84..f475c9d84 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
index 33a3efed1..33a3efed1 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png
index f21c2cf52..f21c2cf52 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
index bc39d3496..bc39d3496 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png
index be1a1d9dc..be1a1d9dc 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
index 58929661f..58929661f 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png
index 841cfa958..841cfa958 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
index 3020357a4..3020357a4 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png
index 525d1cf6b..525d1cf6b 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
index 3829bb3a0..3829bb3a0 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png
index 54eee5ba0..54eee5ba0 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
index 3548ee2b6..3548ee2b6 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png
index 4116e13fa..4116e13fa 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png
index 6053b7bec..6053b7bec 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png
index 67b4ae314..67b4ae314 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png
index 1fec93532..1fec93532 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
index df385bb1b..df385bb1b 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png
index fa5a05274..fa5a05274 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
index aeb899599..aeb899599 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png
index a649b39cf..a649b39cf 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
index d77c5e1c1..d77c5e1c1 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png
index dba881859..dba881859 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
index ee0661234..ee0661234 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png
index 38cf0cebc..38cf0cebc 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
index 1602747f1..1602747f1 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png
index 11ad802fa..11ad802fa 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png
index 61c23f749..61c23f749 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 99e4c0268..9327c66a5 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -58,9 +58,9 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/verified"
+            android:id="@+id/status_image"
             android:layout_gravity="center"
-            android:src="@drawable/key_certify_ok_depth0"
+            android:src="@drawable/status_signature_verified_cutout"
             android:padding="16dp" />
     </FrameLayout>
 
diff --git a/Resources/graphics/status_lock-closed.svg b/Resources/graphics/status_lock_closed.svg
index 286e89297..286e89297 100644
--- a/Resources/graphics/status_lock-closed.svg
+++ b/Resources/graphics/status_lock_closed.svg
diff --git a/Resources/graphics/status_lock-error.svg b/Resources/graphics/status_lock_error.svg
index d3c4e1d1d..d3c4e1d1d 100644
--- a/Resources/graphics/status_lock-error.svg
+++ b/Resources/graphics/status_lock_error.svg
diff --git a/Resources/graphics/status_lock-open.svg b/Resources/graphics/status_lock_open.svg
index 9beb127af..9beb127af 100644
--- a/Resources/graphics/status_lock-open.svg
+++ b/Resources/graphics/status_lock_open.svg
diff --git a/Resources/graphics/status_signature-expired.svg b/Resources/graphics/status_signature_expired.svg
index 1d280572f..1d280572f 100644
--- a/Resources/graphics/status_signature-expired.svg
+++ b/Resources/graphics/status_signature_expired.svg
diff --git a/Resources/graphics/status_signature-expired-cutout.svg b/Resources/graphics/status_signature_expired_cutout.svg
index 61ac8fdd0..61ac8fdd0 100644
--- a/Resources/graphics/status_signature-expired-cutout.svg
+++ b/Resources/graphics/status_signature_expired_cutout.svg
diff --git a/Resources/graphics/status_signature-invalid.svg b/Resources/graphics/status_signature_invalid.svg
index 3eb204fdd..3eb204fdd 100644
--- a/Resources/graphics/status_signature-invalid.svg
+++ b/Resources/graphics/status_signature_invalid.svg
diff --git a/Resources/graphics/status_signature-invalid-cutout.svg b/Resources/graphics/status_signature_invalid_cutout.svg
index 61fd2ace0..61fd2ace0 100644
--- a/Resources/graphics/status_signature-invalid-cutout.svg
+++ b/Resources/graphics/status_signature_invalid_cutout.svg
diff --git a/Resources/graphics/status_signature-revoked.svg b/Resources/graphics/status_signature_revoked.svg
index 5b6f7a420..5b6f7a420 100644
--- a/Resources/graphics/status_signature-revoked.svg
+++ b/Resources/graphics/status_signature_revoked.svg
diff --git a/Resources/graphics/status_signature-revoked-cutout.svg b/Resources/graphics/status_signature_revoked_cutout.svg
index 0421286fe..0421286fe 100644
--- a/Resources/graphics/status_signature-revoked-cutout.svg
+++ b/Resources/graphics/status_signature_revoked_cutout.svg
diff --git a/Resources/graphics/status_signature-unknown.svg b/Resources/graphics/status_signature_unknown.svg
index f0494aa33..f0494aa33 100644
--- a/Resources/graphics/status_signature-unknown.svg
+++ b/Resources/graphics/status_signature_unknown.svg
diff --git a/Resources/graphics/status_signature-unknown-cutout.svg b/Resources/graphics/status_signature_unknown_cutout.svg
index 402bffcaa..402bffcaa 100644
--- a/Resources/graphics/status_signature-unknown-cutout.svg
+++ b/Resources/graphics/status_signature_unknown_cutout.svg
diff --git a/Resources/graphics/status_signature-unverified.svg b/Resources/graphics/status_signature_unverified.svg
index 6ce6d14dd..6ce6d14dd 100644
--- a/Resources/graphics/status_signature-unverified.svg
+++ b/Resources/graphics/status_signature_unverified.svg
diff --git a/Resources/graphics/status_signature-unverified-cutout.svg b/Resources/graphics/status_signature_unverified_cutout.svg
index ffa98580a..ffa98580a 100644
--- a/Resources/graphics/status_signature-unverified-cutout.svg
+++ b/Resources/graphics/status_signature_unverified_cutout.svg
diff --git a/Resources/graphics/status_signature-verified.svg b/Resources/graphics/status_signature_verified.svg
index 197273c79..197273c79 100644
--- a/Resources/graphics/status_signature-verified.svg
+++ b/Resources/graphics/status_signature_verified.svg
diff --git a/Resources/graphics/status_signature-verified-cutout.svg b/Resources/graphics/status_signature_verified_cutout.svg
index 04356a977..04356a977 100644
--- a/Resources/graphics/status_signature-verified-cutout.svg
+++ b/Resources/graphics/status_signature_verified_cutout.svg