diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index ed3cc66969..b7ce743a18 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -85,8 +85,7 @@
                         android:textColor="?unreadIndicatorTextColor"
                         android:textSize="@dimen/very_small_font_size"
                         android:textStyle="bold"
-                        tools:text="8"
-                        tools:textColor="?android:textColorPrimary" />
+                        tools:text="8"/>
 
                 </RelativeLayout>
 
@@ -115,8 +114,7 @@
                         android:textColor="?unreadIndicatorTextColor"
                         android:textSize="@dimen/very_small_font_size"
                         android:textStyle="bold"
-                        android:text="@"
-                        tools:textColor="?android:textColorPrimary" />
+                        android:text="@" />
 
                 </RelativeLayout>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 66865cca95..eba219b924 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -352,8 +352,8 @@
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
         <item name="conversation_unread_background_color">@color/classic_dark_1</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
-        <item name="unreadIndicatorBackgroundColor">@color/classic_dark_3</item>
-        <item name="unreadIndicatorTextColor">@color/classic_dark_6</item>
+        <item name="unreadIndicatorBackgroundColor">?colorAccent</item>
+        <item name="unreadIndicatorTextColor">@color/classic_dark_0</item>
         
         <!-- New conversation button -->
         <item name="conversation_color_non_main">@color/classic_dark_2</item>
@@ -365,7 +365,7 @@
         <item name="conversationMenuSearchBackgroundColor">@color/classic_dark_0</item>
 
         <!-- Conversation -->
-        <item name="message_received_background_color">@color/classic_dark_3</item>
+        <item name="message_received_background_color">@color/classic_dark_2</item>
         <item name="message_received_text_color">@color/classic_dark_6</item>
         <item name="message_sent_background_color">?colorAccent</item>
         <item name="message_sent_text_color">@color/classic_dark_0</item>
@@ -437,7 +437,7 @@
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
         <item name="conversation_unread_background_color">@color/classic_light_6</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
-        <item name="unreadIndicatorBackgroundColor">@color/classic_light_3</item>
+        <item name="unreadIndicatorBackgroundColor">?colorAccent</item>
         <item name="unreadIndicatorTextColor">@color/classic_light_0</item>
         <!-- New conversation button -->
         <item name="conversation_color_non_main">@color/classic_light_4</item>
@@ -450,7 +450,7 @@
         <item name="conversationMenuSearchBackgroundColor">@color/classic_light_6</item>
 
         <!-- Conversation -->
-        <item name="message_received_background_color">@color/classic_light_3</item>
+        <item name="message_received_background_color">@color/classic_light_4</item>
         <item name="message_received_text_color">@color/classic_light_0</item>
         <item name="message_sent_background_color">?colorAccent</item>
         <item name="message_sent_text_color">@color/classic_light_0</item>
@@ -685,8 +685,8 @@
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
         <item name="conversation_unread_background_color">@color/classic_dark_1</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
-        <item name="unreadIndicatorBackgroundColor">@color/classic_dark_3</item>
-        <item name="unreadIndicatorTextColor">@color/classic_dark_6</item>
+        <item name="unreadIndicatorBackgroundColor">?colorAccent</item>
+        <item name="unreadIndicatorTextColor">@color/classic_dark_0</item>
 
         <!-- New conversation button -->
         <item name="conversation_color_non_main">@color/classic_dark_2</item>
@@ -698,7 +698,7 @@
         <item name="conversationMenuSearchBackgroundColor">@color/classic_dark_0</item>
 
         <!-- Conversation -->
-        <item name="message_received_background_color">@color/classic_dark_3</item>
+        <item name="message_received_background_color">@color/classic_dark_2</item>
         <item name="message_received_text_color">@color/classic_dark_6</item>
         <item name="message_sent_background_color">?colorAccent</item>
         <item name="message_sent_text_color">@color/classic_dark_0</item>