diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
index 35804cd76..f43aa401c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
@@ -31,7 +31,7 @@ class BadgeImageView @JvmOverloads constructor(
   fun setBadgeFromRecipient(recipient: Recipient?) {
     getGlideRequests()?.let {
       setBadgeFromRecipient(recipient, it)
-    }
+    } ?: setImageDrawable(null)
   }
 
   fun setBadgeFromRecipient(recipient: Recipient?, glideRequests: GlideRequests) {
@@ -45,12 +45,10 @@ class BadgeImageView @JvmOverloads constructor(
   fun setBadge(badge: Badge?) {
     getGlideRequests()?.let {
       setBadge(badge, it)
-    }
+    } ?: setImageDrawable(null)
   }
 
   fun setBadge(badge: Badge?, glideRequests: GlideRequests) {
-    visible = badge != null
-
     if (badge != null) {
       glideRequests
         .load(badge)
@@ -60,6 +58,7 @@ class BadgeImageView @JvmOverloads constructor(
     } else {
       glideRequests
         .clear(this)
+      setImageDrawable(null)
     }
   }
 
diff --git a/app/src/main/res/layout/bio_preference_item.xml b/app/src/main/res/layout/bio_preference_item.xml
index cd7ab7a98..83f6b3a7e 100644
--- a/app/src/main/res/layout/bio_preference_item.xml
+++ b/app/src/main/res/layout/bio_preference_item.xml
@@ -26,11 +26,9 @@
         android:layout_marginStart="40dp"
         android:layout_marginTop="40dp"
         android:contentDescription="@string/ImageView__badge"
-        android:visibility="gone"
         app:badge_size="medium"
         app:layout_constraintStart_toStartOf="@id/icon"
-        app:layout_constraintTop_toTopOf="@id/icon"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="@id/icon" />
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/contact_selection_list_item.xml b/app/src/main/res/layout/contact_selection_list_item.xml
index 27e4cd353..d2e171dd1 100644
--- a/app/src/main/res/layout/contact_selection_list_item.xml
+++ b/app/src/main/res/layout/contact_selection_list_item.xml
@@ -30,7 +30,6 @@
         android:layout_marginStart="20dp"
         android:layout_marginTop="22dp"
         android:contentDescription="@string/ImageView__badge"
-        android:visibility="gone"
         app:badge_size="medium"
         app:layout_constraintStart_toStartOf="@id/contact_photo_image"
         app:layout_constraintTop_toTopOf="@id/contact_photo_image"
diff --git a/app/src/main/res/layout/conversation_banner_view.xml b/app/src/main/res/layout/conversation_banner_view.xml
index bf71f24e2..d8a5aa5c2 100644
--- a/app/src/main/res/layout/conversation_banner_view.xml
+++ b/app/src/main/res/layout/conversation_banner_view.xml
@@ -23,11 +23,9 @@
         android:layout_marginStart="47dp"
         android:layout_marginTop="48dp"
         android:contentDescription="@string/ImageView__badge"
-        android:visibility="gone"
         app:badge_size="large"
         app:layout_constraintStart_toStartOf="@id/message_request_avatar"
-        app:layout_constraintTop_toTopOf="@id/message_request_avatar"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="@id/message_request_avatar" />
 
     <LinearLayout
         android:id="@+id/message_request_avatar_tap_to_view"
diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml
index 50e322bae..fad7366b5 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -62,8 +62,7 @@
         android:layout_marginStart="14dp"
         android:layout_marginTop="16dp"
         android:visibility="gone"
-        app:badge_size="small"
-        tools:background="@color/red" />
+        app:badge_size="small" />
 
     <org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble
         android:id="@+id/body_bubble"
diff --git a/app/src/main/res/layout/conversation_item_received_text_only.xml b/app/src/main/res/layout/conversation_item_received_text_only.xml
index f80867634..a7003afa4 100644
--- a/app/src/main/res/layout/conversation_item_received_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_received_text_only.xml
@@ -62,8 +62,7 @@
         android:layout_marginStart="14dp"
         android:layout_marginTop="16dp"
         android:visibility="gone"
-        app:badge_size="small"
-        tools:background="@color/red" />
+        app:badge_size="small" />
 
     <org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble
         android:id="@+id/body_bubble"
diff --git a/app/src/main/res/layout/conversation_list_item_view.xml b/app/src/main/res/layout/conversation_list_item_view.xml
index 0b1877993..a232e99a7 100644
--- a/app/src/main/res/layout/conversation_list_item_view.xml
+++ b/app/src/main/res/layout/conversation_list_item_view.xml
@@ -181,10 +181,8 @@
         android:layout_marginStart="26dp"
         android:layout_marginTop="26dp"
         android:contentDescription="@string/ImageView__badge"
-        android:visibility="gone"
         app:badge_size="medium"
         app:layout_constraintStart_toStartOf="@id/conversation_list_item_avatar"
-        app:layout_constraintTop_toTopOf="@id/conversation_list_item_avatar"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="@id/conversation_list_item_avatar" />
 
 </org.thoughtcrime.securesms.conversationlist.ConversationListItem>
diff --git a/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml b/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml
index 407fa631b..c4491c7c2 100644
--- a/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml
+++ b/app/src/main/res/layout/conversation_settings_avatar_preference_item.xml
@@ -28,10 +28,8 @@
             android:layout_marginStart="47dp"
             android:layout_marginTop="48dp"
             android:contentDescription="@string/ImageView__badge"
-            android:visibility="gone"
             app:badge_size="large"
             app:layout_constraintStart_toStartOf="@id/bio_preference_avatar"
-            app:layout_constraintTop_toTopOf="@id/bio_preference_avatar"
-            tools:visibility="visible" />
+            app:layout_constraintTop_toTopOf="@id/bio_preference_avatar" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conversation_title_view.xml b/app/src/main/res/layout/conversation_title_view.xml
index fa7d63efb..6699dc9c4 100644
--- a/app/src/main/res/layout/conversation_title_view.xml
+++ b/app/src/main/res/layout/conversation_title_view.xml
@@ -38,9 +38,7 @@
             android:layout_marginStart="22dp"
             android:layout_marginTop="22dp"
             android:contentDescription="@string/ImageView__badge"
-            android:visibility="gone"
-            app:badge_size="small"
-            tools:visibility="visible" />
+            app:badge_size="small" />
     </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/group_recipient_list_item.xml b/app/src/main/res/layout/group_recipient_list_item.xml
index 324efa2f8..40561d16d 100644
--- a/app/src/main/res/layout/group_recipient_list_item.xml
+++ b/app/src/main/res/layout/group_recipient_list_item.xml
@@ -26,11 +26,9 @@
         android:layout_marginStart="20dp"
         android:layout_marginTop="22dp"
         android:contentDescription="@string/ImageView__badge"
-        android:visibility="gone"
         app:badge_size="medium"
         app:layout_constraintStart_toStartOf="@id/recipient_avatar"
-        app:layout_constraintTop_toTopOf="@id/recipient_avatar"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="@id/recipient_avatar" />
 
     <androidx.appcompat.widget.AppCompatCheckBox
         android:id="@+id/recipient_selected"
diff --git a/app/src/main/res/layout/message_details_recipient.xml b/app/src/main/res/layout/message_details_recipient.xml
index 9345cbbdb..cabd935bd 100644
--- a/app/src/main/res/layout/message_details_recipient.xml
+++ b/app/src/main/res/layout/message_details_recipient.xml
@@ -37,11 +37,9 @@
             android:layout_marginStart="20dp"
             android:layout_marginTop="22dp"
             android:contentDescription="@string/ImageView__badge"
-            android:visibility="gone"
             app:badge_size="medium"
             app:layout_constraintStart_toStartOf="@id/message_details_recipient_avatar"
-            app:layout_constraintTop_toTopOf="@id/message_details_recipient_avatar"
-            tools:visibility="visible" />
+            app:layout_constraintTop_toTopOf="@id/message_details_recipient_avatar" />
 
         <org.thoughtcrime.securesms.components.FromTextView
             android:id="@+id/message_details_recipient_name"
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index 319466d8b..7efb43af5 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -28,11 +28,9 @@
             android:layout_marginStart="47dp"
             android:layout_marginTop="48dp"
             android:contentDescription="@string/ImageView__badge"
-            android:visibility="gone"
             app:badge_size="large"
             app:layout_constraintStart_toStartOf="@id/rbs_recipient_avatar"
-            app:layout_constraintTop_toTopOf="@id/rbs_recipient_avatar"
-            tools:visibility="visible" />
+            app:layout_constraintTop_toTopOf="@id/rbs_recipient_avatar" />
 
         <ProgressBar
             android:id="@+id/rbs_admin_action_busy"