diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
index 670ab6e49..547a5eed1 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
@@ -122,20 +122,21 @@ public class MagicIncomingTextMessageViewHolder
                 messageUserAvatarView.getHierarchy().setPlaceholderImage(drawable);
             }
         } else {
-            Resources resources = context.getResources();
-
-            int bg_bubble_color = DisplayUtils.isDarkModeActive(context) ?
-                                resources.getColor(R.color.bg_message_list_incoming_bubble_dark2) :
-                                resources.getColor(R.color.bg_message_list_incoming_bubble);
 
             messageUserAvatarView.setVisibility(View.INVISIBLE);
-            Drawable bubbleDrawable = DisplayUtils.getMessageSelector(bg_bubble_color,
-                    resources.getColor(R.color.transparent),
-                    bg_bubble_color, R.drawable.shape_grouped_incoming_message);
-            ViewCompat.setBackground(bubble, bubbleDrawable);
             messageAuthor.setVisibility(View.GONE);
         }
 
+        Resources resources = context.getResources();
+        int bg_bubble_color = DisplayUtils.isDarkModeActive(context) ?
+                resources.getColor(R.color.bg_message_list_incoming_bubble_dark2) :
+                resources.getColor(R.color.bg_message_list_incoming_bubble);
+
+        Drawable bubbleDrawable = DisplayUtils.getMessageSelector(bg_bubble_color,
+                resources.getColor(R.color.transparent),
+                bg_bubble_color, R.drawable.shape_grouped_incoming_message);
+        ViewCompat.setBackground(bubble, bubbleDrawable);
+
         HashMap<String, HashMap<String, String>> messageParameters = message.getMessageParameters();
 
         Context context = NextcloudTalkApplication.getSharedApplication().getApplicationContext();
diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
index b5b3485f9..46e96e8b5 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
@@ -28,7 +28,6 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.BitmapDrawable;
@@ -250,7 +249,7 @@ public class DisplayUtils {
 
         if (!isCall) {
             if (chipResource == R.xml.chip_outgoing_others || chipResource == R.xml.chip_accent_background) {
-                drawable = R.drawable.white_circle;
+                drawable = R.drawable.mention_chip;
             } else {
                 drawable = R.drawable.accent_circle;
             }
diff --git a/app/src/main/res/drawable/white_circle.xml b/app/src/main/res/drawable/mention_chip.xml
similarity index 94%
rename from app/src/main/res/drawable/white_circle.xml
rename to app/src/main/res/drawable/mention_chip.xml
index 6085a1d00..354366deb 100644
--- a/app/src/main/res/drawable/white_circle.xml
+++ b/app/src/main/res/drawable/mention_chip.xml
@@ -22,5 +22,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <solid
-        android:color="@color/bg_default"/>
+        android:color="@color/bg_dark_mention_chips"/>
 </shape>
diff --git a/app/src/main/res/drawable/shape_grouped_incoming_message.xml b/app/src/main/res/drawable/shape_grouped_incoming_message.xml
index 80a0f63d0..e8012bcf5 100644
--- a/app/src/main/res/drawable/shape_grouped_incoming_message.xml
+++ b/app/src/main/res/drawable/shape_grouped_incoming_message.xml
@@ -28,6 +28,6 @@
         android:bottomLeftRadius="@dimen/message_bubble_corners_radius"
         android:topRightRadius="@dimen/message_bubble_corners_radius" />
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/bg_default" />
 
 </shape>
diff --git a/app/src/main/res/drawable/shape_grouped_outcoming_message.xml b/app/src/main/res/drawable/shape_grouped_outcoming_message.xml
index 011d7f63b..22852f946 100644
--- a/app/src/main/res/drawable/shape_grouped_outcoming_message.xml
+++ b/app/src/main/res/drawable/shape_grouped_outcoming_message.xml
@@ -28,6 +28,6 @@
         android:topLeftRadius="@dimen/message_bubble_corners_radius"
         android:bottomRightRadius="@dimen/message_bubble_corners_radius" />
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/bg_default" />
 
 </shape>
diff --git a/app/src/main/res/drawable/shape_outcoming_message.xml b/app/src/main/res/drawable/shape_outcoming_message.xml
index fb5c1c310..574cb08aa 100644
--- a/app/src/main/res/drawable/shape_outcoming_message.xml
+++ b/app/src/main/res/drawable/shape_outcoming_message.xml
@@ -28,6 +28,6 @@
         android:topLeftRadius="@dimen/message_bubble_corners_radius"
         android:bottomRightRadius="@dimen/message_bubble_corners_radius" />
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/bg_default" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7d3b019a9..a933d395c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -64,6 +64,7 @@
     <color name="bg_default">#FFFFFF</color>
     <color name="bg_alt">@color/white60</color>
     <color name="bg_system_bubble_dark">#444444</color>
+    <color name="bg_dark_mention_chips">#333333</color>
     <color name="bg_message_list_incoming_bubble">#EFEFEF</color>
     <color name="bg_message_list_incoming_bubble_dark2">#444444</color>
     <color name="bg_bottom_sheet">#46ffffff</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d62164cb3..0af4581a5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,7 +44,7 @@
     </style>
 
     <style name="ChipOutgoingTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
-        <item name="android:textColor">@color/nc_outcoming_text_default</item>
+        <item name="android:textColor">@color/nc_incoming_text_default</item>
     </style>
 
     <style name="ChipMentionTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
diff --git a/app/src/main/res/xml/chip_outgoing_others.xml b/app/src/main/res/xml/chip_outgoing_others.xml
index 91e2e1042..56bc98529 100644
--- a/app/src/main/res/xml/chip_outgoing_others.xml
+++ b/app/src/main/res/xml/chip_outgoing_others.xml
@@ -22,7 +22,7 @@
 <chip xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:textAppearance="@style/ChipOutgoingTextAppearance"
-    app:chipStrokeColor="@color/white"
+    app:chipStrokeColor="@color/bg_default"
     app:chipBackgroundColor="@color/transparent"
     app:chipStrokeWidth="1dp"
     app:closeIconEnabled="false" />