diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index 19dd62e46f..ec8e8e7b4b 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -146,7 +146,7 @@ public class ContactInfo {
 
             boolean dark = !"light".equals(tv.string);
             boolean identicons = prefs.getBoolean("identicons", false);
-            if (identicons)
+            if (identicons && BuildConfig.DEBUG)
                 info.bitmap = Identicon.icon(key, dp, 5, dark);
             else
                 info.bitmap = Identicon.letter(key, dp, dark);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 57ac10b3fe..a544c01a84 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -741,6 +741,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
         swThreading.setChecked(prefs.getBoolean("threading", true));
         swAvatars.setChecked(prefs.getBoolean("avatars", true));
         swIdenticons.setChecked(prefs.getBoolean("identicons", false));
+        swIdenticons.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
         swCircular.setChecked(prefs.getBoolean("circular", true));
         swNameEmail.setChecked(prefs.getBoolean("name_email", !compact));
         swSubjectItalic.setChecked(prefs.getBoolean("subject_italic", true));