diff --git a/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml b/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
index 745242dbbcabac34163700fd622bc2f8653d5752..2d93d6e2371c03586f4270f185fe160115ef97eb 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
@@ -92,7 +92,7 @@
                     android:layout_height="16dp"
                     android:layout_gravity="end|bottom"
                     app:srcCompat="@drawable/compatibility"
-                    app:tint="@color/light_black" />
+                    app:tint="@color/default_icon_color" />
             </FrameLayout>
 
         </com.fsck.k9.view.ToolableViewAnimator>
@@ -135,15 +135,7 @@
                 <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:id="@+id/crypto_status_trusted"
-                    >
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="start|center_vertical"
-                        app:srcCompat="@drawable/status_dots"
-                        app:tint="?attr/openpgp_grey" />
+                    android:id="@+id/crypto_status_trusted">
 
                     <ImageView
                         android:layout_width="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
index 9051668d320999793029796d4c88254621cf19de..aa8e940df37fcc15fc75a0ba56e622d79828ead0 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
@@ -114,13 +114,6 @@
             android:padding="13dp"
             tools:visibility="gone">
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start|center_vertical"
-                app:srcCompat="@drawable/status_dots"
-                app:tint="?attr/openpgp_grey" />
-
             <ImageView
                 android:id="@+id/alternate_crypto_status_icon"
                 android:layout_width="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml b/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
index ad26856fe5dd2c11ab4e090c772843c177927e97..2edd795083bdf507f882c881c57946e8d37218fd 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
@@ -57,13 +57,6 @@
         android:visibility="gone"
         >
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start|center_vertical"
-            app:srcCompat="@drawable/status_dots"
-            app:tint="?attr/openpgp_grey" />
-
         <ImageView
             android:id="@+id/contact_crypto_status_icon"
             android:layout_width="wrap_content"