diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
index e205bd30c..ecb3d7625 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -126,7 +126,7 @@ class ConversationItem(
         holder.dialogUnreadBubble!!.text = model.unreadMessages.toLong()
             .toString()
       } else {
-        holder.dialogUnreadBubble!!.text = "99+"
+        holder.dialogUnreadBubble!!.text = context.getString(R.string.nc_99_plus)
       }
 
       if (model.unreadMention) {
diff --git a/app/src/main/res/drawable/bubble_circle_unread.xml b/app/src/main/res/drawable/bubble_circle_unread.xml
index c33626dd2..aa706e37c 100644
--- a/app/src/main/res/drawable/bubble_circle_unread.xml
+++ b/app/src/main/res/drawable/bubble_circle_unread.xml
@@ -20,9 +20,8 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval">
+       android:shape="oval" >
+    <size android:width="16dp" android:height="16dp"/>
     <solid android:color="#757575" />
-    <size
-        android:width="32dp"
-        android:height="32dp" />
+
 </shape>
diff --git a/app/src/main/res/drawable/bubble_circle_unread_mention.xml b/app/src/main/res/drawable/bubble_circle_unread_mention.xml
index 38e601ac0..201d22ab2 100644
--- a/app/src/main/res/drawable/bubble_circle_unread_mention.xml
+++ b/app/src/main/res/drawable/bubble_circle_unread_mention.xml
@@ -23,6 +23,6 @@
        android:shape="oval">
     <solid android:color="@color/colorPrimary" />
     <size
-        android:width="32dp"
-        android:height="32dp" />
+        android:width="16dp"
+        android:height="16dp" />
 </shape>
diff --git a/app/src/main/res/layout/controller_conversations_rv.xml b/app/src/main/res/layout/controller_conversations_rv.xml
index 27f962d92..edfacf3c1 100644
--- a/app/src/main/res/layout/controller_conversations_rv.xml
+++ b/app/src/main/res/layout/controller_conversations_rv.xml
@@ -52,7 +52,7 @@
           android:id="@+id/recyclerView"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
-          tools:listitem="@layout/rv_item_conversation"
+          tools:listitem="@layout/rv_item_conversation_with_last_message"
           />
 
     </FrameLayout>
diff --git a/app/src/main/res/layout/rv_item_conversation.xml b/app/src/main/res/layout/rv_item_conversation.xml
index 41b124f37..afda6fa37 100644
--- a/app/src/main/res/layout/rv_item_conversation.xml
+++ b/app/src/main/res/layout/rv_item_conversation.xml
@@ -44,11 +44,12 @@
             android:src="@drawable/ic_lock_white_24px"
             android:visibility="visible" />
 
-        <ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+        <ImageView
             android:id="@+id/avatar_image"
             android:layout_width="@dimen/small_item_height"
             android:layout_height="@dimen/small_item_height"
-            android:layout_margin="@dimen/margin_between_elements"/>
+            android:layout_margin="@dimen/margin_between_elements"
+            />
 
     </FrameLayout>
 
@@ -58,10 +59,10 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/margin_between_elements"
         android:background="?android:attr/selectableItemBackground"
         android:scaleType="center"
-        android:src="@drawable/ic_more_horiz_black_24dp" />
+        android:src="@drawable/ic_more_horiz_black_24dp"
+        />
 
     <LinearLayout
         android:id="@+id/linear_layout"
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index f4ab0d731..2b39983c5 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -88,18 +88,20 @@
 
             <TextView
                 android:id="@id/dialogUnreadBubble"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
                 android:layout_alignParentEnd="true"
                 android:layout_marginStart="8dp"
                 android:background="@drawable/bubble_circle_unread"
-                android:gravity="center"
+                android:gravity="center_vertical"
+                android:layout_centerInParent="true"
                 android:lines="1"
                 android:textAlignment="center"
                 android:textColor="@color/conversation_unread_bubble"
-                android:textSize="12sp"
+                android:textSize="8sp"
                 tools:background="@drawable/bubble_circle_unread"
-                tools:text="99+" />
+                tools:text="99+"
+                />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04d83fd3f..d42465d5b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -320,6 +320,9 @@
     <string name="nc_last_moderator_title">Could not leave conversation</string>
     <string name="nc_last_moderator">You need to promote a new moderator before you can leave %1$s.</string>
 
+    <!-- Chat -->
+    <string name="nc_99_plus">99+</string>
+
     <!-- Non-translatable strings -->
 
     <string name="path_password_strike_through" translatable="false"