diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
index 7bf1af393..b38d874d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
@@ -144,9 +144,9 @@ public class CreateKeyPassphraseFragment extends Fragment {
                 }
 
                 if (areEditTextsEqual(mPassphraseEdit, mPassphraseEditAgain)) {
-                    mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_done_grey_24dp, 0);
+                    mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_ok, 0);
                 } else {
-                    mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_close_grey_24dp, 0);
+                    mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_bad, 0);
                 }
 
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
index e55f6b1ad..494ccb6d3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
@@ -75,10 +75,10 @@ public class EmailEditText extends AppCompatAutoCompleteTextView {
                 Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
                 if (emailMatcher.matches()) {
                     EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0,
-                            R.drawable.uid_mail_ok, 0);
+                            R.drawable.ic_stat_retyped_ok, 0);
                 } else {
                     EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0,
-                            R.drawable.uid_mail_bad, 0);
+                            R.drawable.ic_stat_retyped_bad, 0);
                 }
             } else {
                 // remove drawable if email is empty
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png
rename to OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png
rename to OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png
rename to OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png
rename to OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png
rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png
rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png
rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png
rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png