diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 09a9881a9..916f7ba00 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -756,9 +756,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     private fun updateUnreadCountIndicator() {
-        val formattedUnreadCount = if (unreadCount < 100) unreadCount.toString() else "99+"
+        val formattedUnreadCount = if (unreadCount < 10000) unreadCount.toString() else "9999+"
         binding.unreadCountTextView.text = formattedUnreadCount
-        val textSize = if (unreadCount < 100) 12.0f else 9.0f
+        val textSize = if (unreadCount < 10000) 12.0f else 9.0f
         binding.unreadCountTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
         binding.unreadCountTextView.setTypeface(Typeface.DEFAULT, if (unreadCount < 100) Typeface.BOLD else Typeface.NORMAL)
         binding.unreadCountIndicator.isVisible = (unreadCount != 0)
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 0cd1ad40b..3e4a71200 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -61,10 +61,10 @@ class ConversationView : LinearLayout {
         val formattedUnreadCount = if (thread.isRead) {
             null
         } else {
-            if (unreadCount < 100) unreadCount.toString() else "99+"
+            if (unreadCount < 10000) unreadCount.toString() else "9999+"
         }
         binding.unreadCountTextView.text = formattedUnreadCount
-        val textSize = if (unreadCount < 100) 12.0f else 9.0f
+        val textSize = if (unreadCount < 10000) 12.0f else 9.0f
         binding.unreadCountTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
         binding.unreadCountTextView.setTypeface(Typeface.DEFAULT, if (unreadCount < 100) Typeface.BOLD else Typeface.NORMAL)
         binding.unreadCountIndicator.isVisible = (unreadCount != 0 && !thread.isRead)
@@ -120,4 +120,4 @@ class ConversationView : LinearLayout {
         }
     }
     // endregion
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/drawable/rounded_rectangle.xml b/app/src/main/res/drawable/rounded_rectangle.xml
new file mode 100644
index 000000000..4901429e3
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_rectangle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index 61e1680ef..3309a648f 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -115,11 +115,14 @@
 
         <RelativeLayout
             android:id="@+id/unreadCountIndicator"
-            android:layout_width="20dp"
+            android:layout_width="wrap_content"
+            android:maxWidth="40dp"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
             android:layout_height="20dp"
             android:layout_centerHorizontal="true"
             android:layout_alignParentTop="true"
-            android:background="@drawable/circle_tintable"
+            android:background="@drawable/rounded_rectangle"
             android:backgroundTint="@color/conversation_unread_count_indicator_background">
 
             <TextView
@@ -165,4 +168,4 @@
 
     </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index 2df317c30..0d63ea3a6 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -63,10 +63,13 @@
 
                     <RelativeLayout
                         android:id="@+id/unreadCountIndicator"
-                        android:layout_width="20dp"
+                        android:layout_width="wrap_content"
+                        android:maxWidth="40dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
                         android:layout_height="20dp"
                         android:layout_marginStart="4dp"
-                        android:background="@drawable/circle_tintable"
+                        android:background="@drawable/rounded_rectangle"
                         android:backgroundTint="@color/conversation_unread_count_indicator_background">
 
                         <TextView
@@ -148,4 +151,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>