diff --git a/res/layout/attachment_type_selector.xml b/res/layout/attachment_type_selector.xml
index 626543ca4..0978066a4 100644
--- a/res/layout/attachment_type_selector.xml
+++ b/res/layout/attachment_type_selector.xml
@@ -225,7 +225,7 @@
                         android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
                         android:scaleType="center"
                         android:contentDescription="@string/menu_add_attachment"
-                        app:circleColor="@color/close_icon"/>
+                        app:circleColor="?attr/close_icon_color"/>
 
                 <TextView android:layout_marginTop="10dp"
                           android:layout_width="wrap_content"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a95137bea..213bc4ca0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,6 +23,7 @@
     <attr name="send_button_color" format="reference|color" />
     <attr name="input_panel_bg_color" format="reference|color" />
     <attr name="lower_right_divet" format="reference" />
+    <attr name="close_icon_color" format="reference|color" />
 
     <attr name="centered_app_title_color" format="reference|color" />
     <attr name="ic_arrow_forward" format="reference" />
diff --git a/res/values/core_colors.xml b/res/values/core_colors.xml
index 6d56b6f8a..24b03a74c 100644
--- a/res/values/core_colors.xml
+++ b/res/values/core_colors.xml
@@ -11,7 +11,6 @@
     <color name="contact_icon">#608496</color>
     <color name="gallery_icon">#a47ad9</color>
     <color name="location_icon">#66BB6A</color>
-    <color name="close_icon">#A4A6A9</color>
 
     <color name="core_white">#ffffff</color>
     <color name="core_light_02">#F9FAFA</color>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index cc4b9f734..1e63f007a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -105,6 +105,7 @@
         <item name="input_panel_bg_color">@color/white</item>
         <item name="send_button_color">@color/delta_primary</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
+        <item name="close_icon_color">#A4A6A9</item>
 
         <item name="conversation_group_member_name">#99000000</item>
 
@@ -294,6 +295,7 @@
         <item name="input_panel_bg_color">@color/gray95</item>
         <item name="send_button_color">@color/gray70</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
+        <item name="close_icon_color">@color/gray70</item>
 
         <!-- dark theme -->
         <item name="conversation_background">@color/black</item>