diff --git a/app/src/main/res/drawable/shape_squircle_file_bubble_gray_background.xml b/app/src/main/res/drawable/shape_squircle_file_bubble_gray_background.xml
new file mode 100644
index 000000000..ea2766b99
--- /dev/null
+++ b/app/src/main/res/drawable/shape_squircle_file_bubble_gray_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="5dp" />
+    <solid android:color="?attr/color_grey_100"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_bubble_file_grid_cell.xml b/app/src/main/res/layout/chat_bubble_file_grid_cell.xml
index 99423ebf7..24b67390a 100644
--- a/app/src/main/res/layout/chat_bubble_file_grid_cell.xml
+++ b/app/src/main/res/layout/chat_bubble_file_grid_cell.xml
@@ -8,6 +8,9 @@
         <variable
             name="onLongClickListener"
             type="View.OnLongClickListener" />
+        <variable
+            name="useGrayBackground"
+            type="Boolean" />
         <variable
             name="model"
             type="org.linphone.ui.main.chat.model.FileModel" />
@@ -22,7 +25,7 @@
         android:id="@+id/background"
         android:layout_width="@dimen/chat_bubble_grid_file_size"
         android:layout_height="@dimen/chat_bubble_grid_file_size"
-        android:background="@drawable/shape_squircle_file_bubble_background"
+        android:background="@{useGrayBackground ? @drawable/shape_squircle_file_bubble_gray_background : @drawable/shape_squircle_file_bubble_background, default=@drawable/shape_squircle_file_bubble_background}"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/chat_conversation_attachments_area_cell.xml b/app/src/main/res/layout/chat_conversation_attachments_area_cell.xml
index 97124ef66..c71354058 100644
--- a/app/src/main/res/layout/chat_conversation_attachments_area_cell.xml
+++ b/app/src/main/res/layout/chat_conversation_attachments_area_cell.xml
@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_margin="2dp">
 
         <include
             android:id="@+id/media_layout"
@@ -31,16 +32,17 @@
             layout="@layout/chat_bubble_file_grid_cell"
             android:visibility="@{!model.isImage &amp;&amp; !model.isVideoPreview ? View.VISIBLE : View.GONE}"
             bind:model="@{model}"
+            bind:useGrayBackground="@{true}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <ImageView
             android:id="@+id/remove_attachment"
             android:onClick="@{() -> model.onClick()}"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="@dimen/icon_size"
-            android:layout_marginTop="3dp"
-            android:layout_marginEnd="3dp"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="4dp"
             android:padding="3dp"
             android:src="@drawable/x"
             android:background="@drawable/shape_white_round"