diff --git a/app/src/main/res/drawable/shape_circle_light_blue_background.xml b/app/src/main/res/drawable/shape_circle_light_blue_background.xml
index cbd763d6f..e4bc5768d 100644
--- a/app/src/main/res/drawable/shape_circle_light_blue_background.xml
+++ b/app/src/main/res/drawable/shape_circle_light_blue_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
     <size android:width="44dp" android:height="44dp" />
-    <solid android:color="?attr/color_main2_200"/>
+    <solid android:color="?attr/color_button_background"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml b/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml
index 3f0b6ad4c..5221604f3 100644
--- a/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml
+++ b/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
     <size android:width="44dp" android:height="44dp" />
-    <solid android:color="?attr/color_grey_200"/>
+    <solid android:color="?attr/color_button_disabled_background"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml b/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml
index f0cf8d405..8016e4d8d 100644
--- a/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml
+++ b/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
     <size android:width="44dp" android:height="44dp" />
-    <solid android:color="?attr/color_main2_300"/>
+    <solid android:color="?attr/color_button_pressed_background"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index bb9c8f04c..d35a04596 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -60,16 +60,24 @@
         <item name="color_text_field_background">@color/text_field_background_color_dark_mode</item>
         <item name="color_avatar_background">@color/text_field_background_color_dark_mode</item>
         <item name="color_avatar_text">@color/gray_main2_300</item>
+
         <item name="color_chat_bubble_incoming">@color/background_color_alt_dark_mode</item>
         <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
         <item name="color_chat_bubble_reply">@color/gray_500</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>
+
+        <item name="color_button_background">@color/gray_main2_700</item>
+        <item name="color_button_pressed_background">@color/gray_main2_600</item>
+        <item name="color_button_disabled_background">@color/gray_600</item>
 
         <item name="color_gradient_start">@color/background_color_alt_dark_mode</item>
         <item name="color_gradient_end">@color/background_color_alt_dark_mode</item>
+
         <item name="color_trust_background">@color/gray_main2_600</item>
         <item name="color_trust_track">@color/text_field_background_color_dark_mode</item>
-        <item name="color_conversation_send_area_background">@color/background_color_alt_dark_mode</item>
+
         <item name="color_bottom_sheet_handle">@color/gray_main2_400</item>
         <item name="color_bottom_sheet_background">@color/background_color_alt_dark_mode</item>
     </style>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a593a9cd3..690432dbd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -58,16 +58,24 @@
         <attr name="color_text_field_background" format="color"/>
         <attr name="color_avatar_background" format="color"/>
         <attr name="color_avatar_text" format="color"/>
+
         <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_message_text_field_background" format="color"/>
+        <attr name="color_conversation_send_area_background" format="color"/>
+
+        <attr name="color_button_background" format="color" />
+        <attr name="color_button_pressed_background" format="color" />
+        <attr name="color_button_disabled_background" format="color" />
 
         <attr name="color_gradient_start" format="color"/>
         <attr name="color_gradient_end" format="color"/>
+
         <attr name="color_trust_background" format="color"/>
         <attr name="color_trust_track" format="color"/>
-        <attr name="color_conversation_send_area_background" format="color"/>
+
         <attr name="color_bottom_sheet_handle" format="color"/>
         <attr name="color_bottom_sheet_background" format="color"/>
     </declare-styleable>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cfc1acf00..4b7ebe669 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -61,16 +61,24 @@
         <item name="color_text_field_background">@color/gray_100</item>
         <item name="color_avatar_background">@color/gray_main2_200</item>
         <item name="color_avatar_text">@color/gray_main2_600</item>
+
         <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_message_text_field_background">@color/bc_white</item>
+        <item name="color_conversation_send_area_background">@color/gray_100</item>
+
+        <item name="color_button_background">@color/gray_main2_200</item>
+        <item name="color_button_pressed_background">@color/gray_main2_300</item>
+        <item name="color_button_disabled_background">@color/gray_200</item>
 
         <item name="color_gradient_start">@color/gray_main2_100</item>
         <item name="color_gradient_end">@color/bc_white</item>
+
         <item name="color_trust_background">@color/gray_main2_100</item>
         <item name="color_trust_track">@color/blue_info_500</item>
-        <item name="color_conversation_send_area_background">@color/gray_100</item>
+
         <item name="color_bottom_sheet_handle">@color/gray_main2_300</item>
         <item name="color_bottom_sheet_background">@color/gray_100</item>
     </style>