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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png
rename to 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
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png
rename to 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
similarity index 100%
rename from Resources/graphics/status_lock-closed.svg
rename to Resources/graphics/status_lock_closed.svg
diff --git a/Resources/graphics/status_lock-error.svg b/Resources/graphics/status_lock_error.svg
similarity index 100%
rename from Resources/graphics/status_lock-error.svg
rename to Resources/graphics/status_lock_error.svg
diff --git a/Resources/graphics/status_lock-open.svg b/Resources/graphics/status_lock_open.svg
similarity index 100%
rename from Resources/graphics/status_lock-open.svg
rename to Resources/graphics/status_lock_open.svg
diff --git a/Resources/graphics/status_signature-expired.svg b/Resources/graphics/status_signature_expired.svg
similarity index 100%
rename from Resources/graphics/status_signature-expired.svg
rename to Resources/graphics/status_signature_expired.svg
diff --git a/Resources/graphics/status_signature-expired-cutout.svg b/Resources/graphics/status_signature_expired_cutout.svg
similarity index 100%
rename from Resources/graphics/status_signature-expired-cutout.svg
rename to Resources/graphics/status_signature_expired_cutout.svg
diff --git a/Resources/graphics/status_signature-invalid.svg b/Resources/graphics/status_signature_invalid.svg
similarity index 100%
rename from Resources/graphics/status_signature-invalid.svg
rename to Resources/graphics/status_signature_invalid.svg
diff --git a/Resources/graphics/status_signature-invalid-cutout.svg b/Resources/graphics/status_signature_invalid_cutout.svg
similarity index 100%
rename from Resources/graphics/status_signature-invalid-cutout.svg
rename to Resources/graphics/status_signature_invalid_cutout.svg
diff --git a/Resources/graphics/status_signature-revoked.svg b/Resources/graphics/status_signature_revoked.svg
similarity index 100%
rename from Resources/graphics/status_signature-revoked.svg
rename to Resources/graphics/status_signature_revoked.svg
diff --git a/Resources/graphics/status_signature-revoked-cutout.svg b/Resources/graphics/status_signature_revoked_cutout.svg
similarity index 100%
rename from Resources/graphics/status_signature-revoked-cutout.svg
rename to Resources/graphics/status_signature_revoked_cutout.svg
diff --git a/Resources/graphics/status_signature-unknown.svg b/Resources/graphics/status_signature_unknown.svg
similarity index 100%
rename from Resources/graphics/status_signature-unknown.svg
rename to Resources/graphics/status_signature_unknown.svg
diff --git a/Resources/graphics/status_signature-unknown-cutout.svg b/Resources/graphics/status_signature_unknown_cutout.svg
similarity index 100%
rename from Resources/graphics/status_signature-unknown-cutout.svg
rename to Resources/graphics/status_signature_unknown_cutout.svg
diff --git a/Resources/graphics/status_signature-unverified.svg b/Resources/graphics/status_signature_unverified.svg
similarity index 100%
rename from Resources/graphics/status_signature-unverified.svg
rename to Resources/graphics/status_signature_unverified.svg
diff --git a/Resources/graphics/status_signature-unverified-cutout.svg b/Resources/graphics/status_signature_unverified_cutout.svg
similarity index 100%
rename from Resources/graphics/status_signature-unverified-cutout.svg
rename to Resources/graphics/status_signature_unverified_cutout.svg
diff --git a/Resources/graphics/status_signature-verified.svg b/Resources/graphics/status_signature_verified.svg
similarity index 100%
rename from Resources/graphics/status_signature-verified.svg
rename to Resources/graphics/status_signature_verified.svg
diff --git a/Resources/graphics/status_signature-verified-cutout.svg b/Resources/graphics/status_signature_verified_cutout.svg
similarity index 100%
rename from Resources/graphics/status_signature-verified-cutout.svg
rename to Resources/graphics/status_signature_verified_cutout.svg