diff --git a/app/src/main/res/drawable/shape_edit_text_focused_background.xml b/app/src/main/res/drawable/shape_edit_text_focused_background.xml
index 933466e99..603f13313 100644
--- a/app/src/main/res/drawable/shape_edit_text_focused_background.xml
+++ b/app/src/main/res/drawable/shape_edit_text_focused_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="63dp" />
-    <solid android:color="?attr/color_main2_000"/>
+    <solid android:color="?attr/color_text_field_background"/>
     <stroke android:width="1dp" android:color="?attr/color_main1_500" />
 </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 141627e04..db19e3009 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -57,12 +57,12 @@
         <item name="color_text">@color/gray_main2_100</item>
         <item name="color_hint_text">@color/gray_main2_300</item>
 
-        <item name="color_text_field_background">@color/text_field_background_color_dark_mode</item>
+        <item name="color_text_field_background">@color/gray_main2_700</item>
         <item name="color_avatar_background">@color/gray_main2_700</item>
         <item name="color_avatar_text">@color/gray_main2_200</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_outgoing">@color/gray_main2_700</item>
         <item name="color_chat_bubble_reply">@color/gray_500</item>
 
         <item name="color_message_text_field_background">@color/gray_500</item>
@@ -76,7 +76,7 @@
         <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_trust_track">#142932</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>
@@ -88,7 +88,7 @@
         <item name="color_main1_300">@color/yellow_main_300</item>
         <item name="color_main1_500">@color/yellow_main_500</item>
         <item name="color_main1_700">@color/yellow_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
+        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
     </style>
 
     <style name="Theme.LinphoneGreen" parent="Theme.Linphone">
@@ -97,7 +97,7 @@
         <item name="color_main1_300">@color/green_main_300</item>
         <item name="color_main1_500">@color/green_main_500</item>
         <item name="color_main1_700">@color/green_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
+        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
     </style>
 
     <style name="Theme.LinphoneBlue" parent="Theme.Linphone">
@@ -106,7 +106,7 @@
         <item name="color_main1_300">@color/blue_main_300</item>
         <item name="color_main1_500">@color/blue_main_500</item>
         <item name="color_main1_700">@color/blue_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
+        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
     </style>
 
     <style name="Theme.LinphoneRed" parent="Theme.Linphone">
@@ -115,7 +115,7 @@
         <item name="color_main1_300">@color/red_main_300</item>
         <item name="color_main1_500">@color/red_main_500</item>
         <item name="color_main1_700">@color/red_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
+        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
     </style>
 
     <style name="Theme.LinphonePink" parent="Theme.Linphone">
@@ -124,7 +124,7 @@
         <item name="color_main1_300">@color/pink_main_300</item>
         <item name="color_main1_500">@color/pink_main_500</item>
         <item name="color_main1_700">@color/pink_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
+        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
     </style>
 
     <style name="Theme.LinphonePurple" parent="Theme.Linphone">
@@ -133,6 +133,6 @@
         <item name="color_main1_300">@color/purple_main_300</item>
         <item name="color_main1_500">@color/purple_main_500</item>
         <item name="color_main1_700">@color/purple_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
+        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 77a82ae3d..b85f95d08 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,6 @@
 
     <color name="background_color_dark_mode">#191919</color>
     <color name="background_color_alt_dark_mode">#303030</color>
-    <color name="text_field_background_color_dark_mode">#142932</color>
 
     <color name="orange_main_100">#FFEACB</color>
     <color name="orange_main_100_alpha_50">#80FFEACB</color>