diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
index 150856853..0f7f4eeff 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageData.kt
@@ -285,14 +285,20 @@ class ChatMessageData(val chatMessage: ChatMessage) : GenericContactData(chatMes
         val reactionsList = arrayListOf<String>()
         val allReactions = chatMessage.reactions
 
+        var sameReactionTwiceOrMore = false
         if (allReactions.isNotEmpty()) {
             for (reaction in allReactions) {
                 val body = reaction.body
                 if (!reactionsList.contains(body)) {
                     reactionsList.add(body)
+                } else {
+                    sameReactionTwiceOrMore = true
                 }
             }
-            reactionsList.add(allReactions.size.toString())
+
+            if (sameReactionTwiceOrMore) {
+                reactionsList.add(allReactions.size.toString())
+            }
         }
 
         reactions.value = reactionsList
diff --git a/app/src/main/res/layout/chat_message_long_press_menu.xml b/app/src/main/res/layout/chat_message_long_press_menu.xml
index d239a17a1..37fa712e4 100644
--- a/app/src/main/res/layout/chat_message_long_press_menu.xml
+++ b/app/src/main/res/layout/chat_message_long_press_menu.xml
@@ -66,6 +66,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:text="@string/emoji_love"
+                android:textColor="?attr/primaryTextColor"
                 app:layout_constraintEnd_toStartOf="@id/thumbs_up"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -79,6 +80,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:text="@string/emoji_thumbs_up"
+                android:textColor="?attr/primaryTextColor"
                 app:layout_constraintEnd_toStartOf="@id/laughing"
                 app:layout_constraintStart_toEndOf="@id/love"
                 app:layout_constraintTop_toTopOf="parent"
@@ -92,6 +94,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:text="@string/emoji_laughing"
+                android:textColor="?attr/primaryTextColor"
                 app:layout_constraintEnd_toStartOf="@id/surprised"
                 app:layout_constraintStart_toEndOf="@id/thumbs_up"
                 app:layout_constraintTop_toTopOf="parent"
@@ -105,6 +108,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:text="@string/emoji_surprised"
+                android:textColor="?attr/primaryTextColor"
                 app:layout_constraintEnd_toStartOf="@id/tear"
                 app:layout_constraintStart_toEndOf="@id/laughing"
                 app:layout_constraintTop_toTopOf="parent"
@@ -118,6 +122,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:text="@string/emoji_tear"
+                android:textColor="?attr/primaryTextColor"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/surprised"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/chat_message_reaction.xml b/app/src/main/res/layout/chat_message_reaction.xml
index 5b16e6f62..f7768bf09 100644
--- a/app/src/main/res/layout/chat_message_reaction.xml
+++ b/app/src/main/res/layout/chat_message_reaction.xml
@@ -12,6 +12,7 @@
         android:textSize="@{data.matches(`\\d+`) ? @dimen/chat_message_emoji_reactions_count_font_size : @dimen/chat_message_emoji_reaction_font_size, default=@dimen/chat_message_emoji_reaction_font_size}"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="@color/dark_grey_color"
         android:layout_marginStart="2dp"
         android:layout_marginEnd="2dp"
         android:text="@{data, default=@string/emoji_love}"/>
diff --git a/app/src/main/res/layout/chat_message_reactions_list_dialog.xml b/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
index 8b9d374cc..2fbe10ed6 100644
--- a/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
+++ b/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
         <import type="android.view.View" />
@@ -25,8 +25,10 @@
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
+            app:tabTextColor="?attr/primaryTextColor"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:background="?attr/backgroundColor" />
 
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bafbcbfdf..3de16f3fc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -355,6 +355,7 @@
 
     <style name="chat_message_emoji_reaction_font">
         <item name="android:textSize">@dimen/chat_message_emoji_reaction_font_size</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
     </style>
 
     <!-- Dialog related -->