diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index b18641e71eaf9745ef735e9e6bef39d946562f2c..9da0928dd4ff21c978f1cc49339f79f5f106cc5e 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -139,7 +139,7 @@
         <item name="iconAboutTwitter">@drawable/ic_twitter</item>
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
-        <item name="openpgp_black">#000</item>
+        <item name="openpgp_black">@color/default_icon_color</item>
         <item name="openpgp_orange">#FF8800</item>
         <item name="openpgp_red">#CC0000</item>
         <item name="openpgp_green">#669900</item>
@@ -265,7 +265,7 @@
         <item name="iconAboutTwitter">@drawable/ic_twitter</item>
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
-        <item name="openpgp_black">#000</item>
+        <item name="openpgp_black">@color/default_icon_color</item>
         <item name="openpgp_orange">#FF8800</item>
         <item name="openpgp_red">#CC0000</item>
         <item name="openpgp_green">#669900</item>
diff --git a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
index 1262310d25b6f150fa5f6b5ff450fdbdd893bb28..894005a033d3a11970d13a3cfb6e0b3ef5058137 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
@@ -5,6 +5,42 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
+    <ImageView
+        android:id="@+id/contact_crypto_status_icon_simple"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_status_corner"
+        app:tint="?openpgp_black"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/contact_crypto_status_icon_simple_enabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_status_corner"
+        app:tint="?openpgp_green"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/contact_crypto_status_icon_simple_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_status_corner"
+        app:tint="?openpgp_red"
+        tools:visibility="gone" />
+
     <View
         android:id="@+id/background"
         android:layout_width="0dp"
@@ -57,41 +93,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Jane Doe" />
 
-    <ImageView
-        android:id="@+id/contact_crypto_status_icon_simple"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_status_corner"
-        app:tint="?openpgp_black"
-        tools:visibility="gone" />
 
-    <ImageView
-        android:id="@+id/contact_crypto_status_icon_simple_enabled"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_status_corner"
-        app:tint="?openpgp_green"
-        tools:visibility="gone" />
-
-    <ImageView
-        android:id="@+id/contact_crypto_status_icon_simple_error"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_status_corner"
-        app:tint="?openpgp_red"
-        tools:visibility="gone" />
 
     <ImageView
         android:id="@+id/contact_crypto_status_red"