diff --git a/app/src/main/res/drawable/chat_bubble_reply_file_background.xml b/app/src/main/res/drawable/chat_bubble_reply_file_background.xml
index c181b358a..5b2b91dca 100644
--- a/app/src/main/res/drawable/chat_bubble_reply_file_background.xml
+++ b/app/src/main/res/drawable/chat_bubble_reply_file_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/chat_bubble_file_background_color"/>
+    <solid android:color="?attr/drawableBackgroundColor"/>
     <stroke android:color="@color/chat_bubble_file_background_border_color" android:width="1dp" />
     <corners android:radius="@dimen/chat_message_round_corner_radius"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
diff --git a/app/src/main/res/layout/chat_message_reply_content_cell.xml b/app/src/main/res/layout/chat_message_reply_content_cell.xml
index a6364ba7c..f63a44c95 100644
--- a/app/src/main/res/layout/chat_message_reply_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_reply_content_cell.xml
@@ -62,13 +62,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:background="@drawable/chat_bubble_reply_file_background"
             android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
-            android:textColor="@color/light_primary_text_color"
+            android:textColor="?attr/primaryTextColor"
             android:padding="5dp"
-            android:drawableTop="@drawable/icon_meeting_schedule"
             android:maxLines="3"
             android:ellipsize="end"
-            android:layout_centerVertical="true"/>
+            android:layout_centerVertical="true"
+            app:drawableTopCompat="@drawable/icon_meeting_schedule" />
 
         <ImageView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml b/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
index 485cf44dc..ed0d1dd1e 100644
--- a/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
@@ -63,22 +63,26 @@
             android:maxWidth="@dimen/chat_message_content_preview_max_width"
             android:maxLines="3"
             android:ellipsize="end"
+            android:background="@drawable/chat_bubble_reply_file_background"
             android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
-            android:textColor="@color/light_primary_text_color"
+            android:textColor="?attr/primaryTextColor"
             android:drawablePadding="5dp"
             android:padding="5dp"
-            android:drawableTop="@drawable/icon_meeting_schedule"
-            android:layout_centerVertical="true"/>
+            android:layout_centerVertical="true"
+            app:drawableTopCompat="@drawable/icon_meeting_schedule" />
 
         <ImageView
             android:layout_width="@dimen/chat_message_small_bubble_file_size"
             android:layout_height="@dimen/chat_message_small_bubble_file_size"
-            android:layout_margin="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="5dp"
             android:background="@drawable/chat_bubble_reply_file_background"
-            android:padding="10dp"
             android:contentDescription="@{data.fileName}"
-            android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}"
-            android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}" />
+            android:padding="10dp"
+            android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}"
+            android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index fce97c303..9a8eee21b 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -34,6 +34,7 @@
         <item name="dividerColor">@color/voip_light_gray</item>
 
         <item name="drawableTintColor">@color/white_color</item>
+        <item name="drawableBackgroundColor">@color/dark_grey_color</item>
         <item name="drawableTintDisabledColor">@color/voip_light_gray</item>
         <item name="drawableTintOverColor">@color/primary_color</item>
         <item name="drawableTintColor2">@color/voip_dark_gray</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 23a0702cb..5882fc52c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -19,6 +19,7 @@
         <attr name="dividerColor" format="color"/>
 
         <attr name="drawableTintColor" format="color"/>
+        <attr name="drawableBackgroundColor" format="color" />
         <attr name="drawableTintDisabledColor" format="color"/>
         <attr name="drawableTintOverColor" format="color"/>
         <attr name="drawableTintColor2" format="color"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c35fb4fad..27138e018 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,6 +41,7 @@
         <item name="dividerColor">@color/light_grey_color</item>
 
         <item name="drawableTintColor">@color/dark_grey_color</item>
+        <item name="drawableBackgroundColor">@color/chat_bubble_file_background_color</item>
         <item name="drawableTintDisabledColor">@color/disabled_color</item>
         <item name="drawableTintOverColor">@color/primary_color</item>
         <item name="drawableTintColor2">@color/white_color</item>