diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 8d5acb244..f93bcc03a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -50,16 +50,18 @@ class ConversationView : LinearLayout {
// region Updating
fun bind(thread: ThreadRecord, isTyping: Boolean, glide: GlideRequests) {
this.thread = thread
- if (thread.isPinned) {
- binding.conversationViewDisplayNameTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(
- 0,
- 0,
- R.drawable.ic_pin,
- 0
- )
- } else {
- binding.conversationViewDisplayNameTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
- }
+
+ binding.conversationViewDisplayNameTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(
+ when {
+ thread.recipient.address.isClosedGroup -> R.drawable.ic_group_icon
+ thread.recipient.address.isOpenGroup -> R.drawable.ic_community
+ else -> 0
+ },
+ 0,
+ if (thread.isPinned) R.drawable.ic_pin else 0,
+ 0
+ )
+
binding.root.background = if (thread.unreadCount > 0) {
ContextCompat.getDrawable(context, R.drawable.conversation_unread_background)
} else {
diff --git a/app/src/main/res/drawable/ic_community.xml b/app/src/main/res/drawable/ic_community.xml
new file mode 100644
index 000000000..bb5695ff9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_community.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_group_icon.xml b/app/src/main/res/drawable/ic_group_icon.xml
new file mode 100644
index 000000000..2bd461490
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_icon.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_pin.xml b/app/src/main/res/drawable/ic_pin.xml
index d241d605b..38da815d4 100644
--- a/app/src/main/res/drawable/ic_pin.xml
+++ b/app/src/main/res/drawable/ic_pin.xml
@@ -1,10 +1,9 @@
diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index d66a1722b..f92132ef9 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -41,8 +41,8 @@