diff --git a/app/src/main/res/color/in_call_button_tint_color.xml b/app/src/main/res/color/in_call_button_tint_color.xml
index 5ec8a6a42..3c8402d0a 100644
--- a/app/src/main/res/color/in_call_button_tint_color.xml
+++ b/app/src/main/res/color/in_call_button_tint_color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/gray_500" />
+    <item android:state_enabled="false" android:color="@color/gray_400" />
     <item android:state_pressed="true" android:color="@color/bc_white" />
     <item android:color="@color/bc_white"/>
 </selector>
diff --git a/app/src/main/res/drawable/shape_squircle_main2_200_5dp.xml b/app/src/main/res/drawable/shape_squircle_file_background_5dp.xml
similarity index 71%
rename from app/src/main/res/drawable/shape_squircle_main2_200_5dp.xml
rename to app/src/main/res/drawable/shape_squircle_file_background_5dp.xml
index 42dd507a6..98e5bcfff 100644
--- a/app/src/main/res/drawable/shape_squircle_main2_200_5dp.xml
+++ b/app/src/main/res/drawable/shape_squircle_file_background_5dp.xml
@@ -1,5 +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_main2_200" />
+    <solid android:color="?attr/color_chat_bubble_file" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_squircle_main2_200_left.xml b/app/src/main/res/drawable/shape_squircle_file_background_left.xml
similarity index 75%
rename from app/src/main/res/drawable/shape_squircle_main2_200_left.xml
rename to app/src/main/res/drawable/shape_squircle_file_background_left.xml
index 779a7ed44..208a28a66 100644
--- a/app/src/main/res/drawable/shape_squircle_main2_200_left.xml
+++ b/app/src/main/res/drawable/shape_squircle_file_background_left.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:topLeftRadius="10dp" android:bottomLeftRadius="10dp" />
-    <solid android:color="?attr/color_main2_200" />
+    <solid android:color="?attr/color_chat_bubble_file" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_ended_actions.xml b/app/src/main/res/layout/call_ended_actions.xml
index 30446f71e..a3ed0c022 100644
--- a/app/src/main/res/layout/call_ended_actions.xml
+++ b/app/src/main/res/layout/call_ended_actions.xml
@@ -40,7 +40,7 @@
             android:src="@drawable/phone_disconnect"
             android:contentDescription="@null"
             android:background="@drawable/shape_squircle_red_disabled_background"
-            app:tint="@color/gray_400"
+            app:tint="@color/in_call_button_tint_color"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"/>
@@ -51,12 +51,12 @@
             android:layout_height="@dimen/call_button_size"
             android:layout_marginEnd="16dp"
             android:padding="@dimen/call_button_icon_padding"
-            android:enabled="false"
             android:src="@drawable/video_camera_slash"
             android:contentDescription="@null"
+            android:enabled="@{false}"
             android:background="@drawable/shape_round_in_call_disabled_button_background"
             android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
-            app:tint="@color/gray_400"
+            app:tint="@color/in_call_button_tint_color"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
@@ -72,8 +72,9 @@
             android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/microphone_slash"
             android:contentDescription="@null"
+            android:enabled="@{false}"
             android:background="@drawable/shape_round_in_call_disabled_button_background"
-            app:tint="@color/gray_400"
+            app:tint="@color/in_call_button_tint_color"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/toggle_video"
@@ -87,8 +88,9 @@
             android:padding="@dimen/call_button_icon_padding"
             android:src="@drawable/speaker_slash"
             android:contentDescription="@null"
+            android:enabled="@{false}"
             android:background="@drawable/shape_round_in_call_disabled_button_background"
-            app:tint="@color/gray_400"
+            app:tint="@color/in_call_button_tint_color"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"
diff --git a/app/src/main/res/layout/call_outgoing_actions.xml b/app/src/main/res/layout/call_outgoing_actions.xml
index 6fade97cb..44ac50dec 100644
--- a/app/src/main/res/layout/call_outgoing_actions.xml
+++ b/app/src/main/res/layout/call_outgoing_actions.xml
@@ -23,7 +23,7 @@
             android:src="@drawable/animated_caret_to_handle"
             android:enabled="false"
             android:contentDescription="@string/content_description_toggle_bottom_sheet"
-            app:tint="@color/gray_400"
+            app:tint="@color/in_call_button_tint_color"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -54,9 +54,10 @@
             android:padding="@dimen/call_button_icon_padding"
             android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
             android:contentDescription="@null"
+            android:enabled="@{false}"
             android:src="@{viewModel.isVideoEnabled ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
             android:background="@drawable/shape_round_in_call_disabled_button_background"
-            app:tint="@color/gray_400"
+            app:tint="@color/in_call_button_tint_color"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
diff --git a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
index f12b67236..0271da5af 100644
--- a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
+++ b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
@@ -41,7 +41,7 @@
             android:layout_height="@dimen/chat_bubble_grid_image_size"
             android:adjustViewBounds="true"
             android:padding="18dp"
-            android:background="@drawable/shape_squircle_main2_200_5dp"
+            android:background="@drawable/shape_squircle_file_background_5dp"
             android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
             android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
             android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"
@@ -95,7 +95,7 @@
             android:id="@+id/left_background"
             android:layout_width="@dimen/chat_bubble_grid_image_size"
             android:layout_height="@dimen/chat_bubble_grid_image_size"
-            android:background="@drawable/shape_squircle_main2_200_left"
+            android:background="@drawable/shape_squircle_file_background_left"
             android:visibility="@{model.isImage || model.isVideoPreview ? View.INVISIBLE : View.VISIBLE}"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/chat_bubble_single_media_content.xml b/app/src/main/res/layout/chat_bubble_single_media_content.xml
index de994c8aa..a9ee9d23f 100644
--- a/app/src/main/res/layout/chat_bubble_single_media_content.xml
+++ b/app/src/main/res/layout/chat_bubble_single_media_content.xml
@@ -29,7 +29,7 @@
             android:layout_height="@dimen/chat_bubble_grid_image_size"
             android:adjustViewBounds="true"
             android:padding="18dp"
-            android:background="@drawable/shape_squircle_main2_200_5dp"
+            android:background="@drawable/shape_squircle_file_background_5dp"
             android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
             android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
             android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"
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 33f259ca1..85a07535d 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
@@ -25,7 +25,7 @@
             android:layout_height="@dimen/chat_bubble_grid_image_size"
             android:adjustViewBounds="true"
             android:padding="18dp"
-            android:background="@drawable/shape_squircle_main2_200_5dp"
+            android:background="@drawable/shape_squircle_file_background_5dp"
             android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
             android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
             android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"
diff --git a/app/src/main/res/layout/chat_document_content_list_cell.xml b/app/src/main/res/layout/chat_document_content_list_cell.xml
index 3ef5735fc..2841e36b5 100644
--- a/app/src/main/res/layout/chat_document_content_list_cell.xml
+++ b/app/src/main/res/layout/chat_document_content_list_cell.xml
@@ -27,7 +27,7 @@
             android:padding="18dp"
             android:contentDescription="@string/content_description_chat_bubble_file"
             android:src="@{model.isWaitingToBeDownloaded ? @drawable/download_simple : model.isPdf ? @drawable/file_pdf : model.isAudio ? @drawable/file_audio : @drawable/file, default=@drawable/file_pdf}"
-            android:background="@drawable/shape_squircle_main2_200_left"
+            android:background="@drawable/shape_squircle_file_background_left"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_media_content_grid_cell.xml b/app/src/main/res/layout/chat_media_content_grid_cell.xml
index b4c8967a6..1703fdcc5 100644
--- a/app/src/main/res/layout/chat_media_content_grid_cell.xml
+++ b/app/src/main/res/layout/chat_media_content_grid_cell.xml
@@ -21,7 +21,7 @@
             android:layout_margin="1dp"
             android:adjustViewBounds="true"
             android:padding="18dp"
-            android:background="@drawable/shape_squircle_main2_200_5dp"
+            android:background="@drawable/shape_squircle_file_background_5dp"
             android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
             android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
             android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index db19e3009..fb069ad48 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -64,6 +64,7 @@
         <item name="color_chat_bubble_incoming">@color/background_color_alt_dark_mode</item>
         <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
         <item name="color_chat_bubble_reply">@color/gray_500</item>
+        <item name="color_chat_bubble_file">@color/gray_main2_800</item>
 
         <item name="color_message_text_field_background">@color/gray_500</item>
         <item name="color_conversation_send_area_background">@color/background_color_alt_dark_mode</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 690432dbd..ea34103d9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -62,6 +62,7 @@
         <attr name="color_chat_bubble_incoming" format="color"/>
         <attr name="color_chat_bubble_outgoing" format="color"/>
         <attr name="color_chat_bubble_reply" format="color"/>
+        <attr name="color_chat_bubble_file" format="color"/>
 
         <attr name="color_message_text_field_background" format="color"/>
         <attr name="color_conversation_send_area_background" format="color"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4b7ebe669..b19b6bd3e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -65,6 +65,7 @@
         <item name="color_chat_bubble_incoming">@color/gray_main2_100</item>
         <item name="color_chat_bubble_outgoing">@color/orange_main_100</item>
         <item name="color_chat_bubble_reply">@color/gray_200</item>
+        <item name="color_chat_bubble_file">@color/gray_main2_200</item>
 
         <item name="color_message_text_field_background">@color/bc_white</item>
         <item name="color_conversation_send_area_background">@color/gray_100</item>