diff --git a/app/src/main/res/color/primary_button_label_color.xml b/app/src/main/res/color/primary_button_label_color.xml
index 76d77769a..31aa017d9 100644
--- a/app/src/main/res/color/primary_button_label_color.xml
+++ b/app/src/main/res/color/primary_button_label_color.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
-        android:color="?attr/color_main2_000" />
+        android:color="?attr/color_on_main" />
     <item android:state_pressed="true"
-        android:color="?attr/color_main2_000" />
+        android:color="?attr/color_on_main" />
     <item
-        android:color="?attr/color_main2_000"/>
+        android:color="?attr/color_on_main"/>
 </selector>
diff --git a/app/src/main/res/layout-land/chat_list_fragment.xml b/app/src/main/res/layout-land/chat_list_fragment.xml
index 2c43282b5..6d9f36319 100644
--- a/app/src/main/res/layout-land/chat_list_fragment.xml
+++ b/app/src/main/res/layout-land/chat_list_fragment.xml
@@ -106,7 +106,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/plus_circle"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml
index a41a3a089..4a9dbfe2d 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -154,7 +154,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/user_plus"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/history_list_fragment.xml b/app/src/main/res/layout-land/history_list_fragment.xml
index 7e93caeb5..b17e4f7dc 100644
--- a/app/src/main/res/layout-land/history_list_fragment.xml
+++ b/app/src/main/res/layout-land/history_list_fragment.xml
@@ -125,7 +125,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/phone_plus"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/meetings_list_fragment.xml b/app/src/main/res/layout-land/meetings_list_fragment.xml
index acc56bff7..53503902f 100644
--- a/app/src/main/res/layout-land/meetings_list_fragment.xml
+++ b/app/src/main/res/layout-land/meetings_list_fragment.xml
@@ -122,7 +122,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/plus_circle"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index f5ec3c407..34f6bc2f5 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -266,7 +266,7 @@
                 android:layout_margin="16dp"
                 android:src="@drawable/caret_double_down"
                 android:visibility="@{viewModel.isUserScrollingUp ? View.VISIBLE : View.GONE}"
-                app:tint="?attr/color_main2_000"
+                app:tint="?attr/color_on_main"
                 app:backgroundTint="?attr/color_main1_500"
                 app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/chat_list_fragment.xml b/app/src/main/res/layout/chat_list_fragment.xml
index 4ba1d47db..494b496fb 100644
--- a/app/src/main/res/layout/chat_list_fragment.xml
+++ b/app/src/main/res/layout/chat_list_fragment.xml
@@ -107,7 +107,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/plus_circle"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
index ee7bfdbac..eedc87565 100644
--- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
@@ -84,6 +84,7 @@
                     android:padding="10dp"
                     android:src="@drawable/smiley"
                     android:visibility="@{viewModel.picturePath.empty ? View.VISIBLE : View.GONE}"
+                    app:tint="?attr/color_main2_500"
                     app:layout_constraintEnd_toEndOf="@id/avatar"
                     app:layout_constraintStart_toStartOf="@id/avatar"
                     app:layout_constraintTop_toTopOf="@id/avatar"
@@ -169,7 +170,7 @@
                     android:paddingEnd="20dp"
                     android:text="@={viewModel.firstName, default=`John`}"
                     android:textSize="14sp"
-                    android:textColor="@color/gray_main2_600"
+                    android:textColor="?attr/color_main2_600"
                     android:hint="@string/contact_editor_first_name"
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
@@ -202,7 +203,7 @@
                     android:paddingEnd="20dp"
                     android:text="@={viewModel.lastName, default=`Doe`}"
                     android:textSize="14sp"
-                    android:textColor="@color/gray_main2_600"
+                    android:textColor="?attr/color_main2_600"
                     android:hint="@string/contact_editor_last_name"
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
@@ -281,7 +282,7 @@
                     android:paddingEnd="20dp"
                     android:text="@={viewModel.company, default=`Belledonne Comm`}"
                     android:textSize="14sp"
-                    android:textColor="@color/gray_main2_600"
+                    android:textColor="?attr/color_main2_600"
                     android:hint="@string/contact_editor_company"
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
@@ -315,7 +316,7 @@
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
                     android:text="@={viewModel.jobTitle, default=`Android dev`}"
                     android:textSize="14sp"
-                    android:textColor="@color/gray_main2_600"
+                    android:textColor="?attr/color_main2_600"
                     android:hint="@string/contact_editor_first_name"
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 550d7120c..ee54701f8 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -156,7 +156,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/user_plus"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/generic_add_participants_fragment.xml b/app/src/main/res/layout/generic_add_participants_fragment.xml
index 69a735fcc..74a13eb35 100644
--- a/app/src/main/res/layout/generic_add_participants_fragment.xml
+++ b/app/src/main/res/layout/generic_add_participants_fragment.xml
@@ -170,7 +170,7 @@
                 android:layout_margin="16dp"
                 android:visibility="@{viewModel.selection.size() > 0 ? View.VISIBLE : View.GONE}"
                 android:src="@drawable/check"
-                app:tint="?attr/color_main2_000"
+                app:tint="?attr/color_on_main"
                 app:backgroundTint="?attr/color_main1_500"
                 app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index 21e021260..c5b845b9c 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -126,7 +126,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/phone_plus"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/meetings_list_fragment.xml b/app/src/main/res/layout/meetings_list_fragment.xml
index 0169d0985..8579cb1a6 100644
--- a/app/src/main/res/layout/meetings_list_fragment.xml
+++ b/app/src/main/res/layout/meetings_list_fragment.xml
@@ -123,7 +123,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_margin="16dp"
                     android:src="@drawable/plus_circle"
-                    app:tint="?attr/color_main2_000"
+                    app:tint="?attr/color_on_main"
                     app:backgroundTint="?attr/color_main1_500"
                     app:shapeAppearanceOverlay="@style/rounded"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml
index 6f2a0ef95..e1c0a36b9 100644
--- a/app/src/main/res/layout/start_call_fragment.xml
+++ b/app/src/main/res/layout/start_call_fragment.xml
@@ -141,7 +141,7 @@
                 android:src="@drawable/meeting"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/search_bar"
-                app:tint="?attr/color_main2_000" />
+                app:tint="?attr/color_on_main" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_800"
@@ -153,7 +153,7 @@
                 android:drawableEnd="@drawable/caret_right"
                 android:padding="5dp"
                 android:text="@string/history_call_start_create_group_call"
-                android:textColor="@color/black"
+                android:textColor="?attr/color_main2_900"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="@id/group_call_icon"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/start_chat_fragment.xml b/app/src/main/res/layout/start_chat_fragment.xml
index d78558772..eb6956338 100644
--- a/app/src/main/res/layout/start_chat_fragment.xml
+++ b/app/src/main/res/layout/start_chat_fragment.xml
@@ -72,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:text="@{viewModel.selectionCount, default=`0 selected`}"
                 android:textSize="12sp"
-                android:textColor="@color/black"
+                android:textColor="?attr/color_main2_900"
                 app:layout_constraintStart_toStartOf="@id/title"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/title" />
@@ -164,7 +164,7 @@
                 android:src="@drawable/users_three"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/search_bar"
-                app:tint="?attr/color_main2_000" />
+                app:tint="?attr/color_on_main" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_800"
@@ -177,7 +177,7 @@
                 android:drawableEnd="@drawable/caret_right"
                 android:padding="5dp"
                 android:text="@string/new_conversation_create_group"
-                android:textColor="@color/black"
+                android:textColor="?attr/color_main2_900"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="@id/group_chat_icon"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -231,7 +231,7 @@
                 android:layout_margin="16dp"
                 android:visibility="@{viewModel.multipleSelectionMode &amp;&amp; viewModel.groupChatRoomCreateButtonEnabled ? View.VISIBLE : View.GONE, default=gone}"
                 android:src="@drawable/check"
-                app:tint="?attr/color_main2_000"
+                app:tint="?attr/color_on_main"
                 app:backgroundTint="?attr/color_main1_500"
                 app:shapeAppearanceOverlay="@style/rounded"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/top_bar.xml b/app/src/main/res/layout/top_bar.xml
index b15d73597..3d64212c8 100644
--- a/app/src/main/res/layout/top_bar.xml
+++ b/app/src/main/res/layout/top_bar.xml
@@ -114,7 +114,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:textCursorDrawable="@null"
-                android:textColor="?attr/color_grey_200"
+                android:textColor="?attr/color_on_main"
                 android:textSize="16sp"
                 android:inputType="text"
                 android:paddingVertical="1dp"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 8af58fea9..cc5fcf4bf 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -15,24 +15,24 @@
         <item name="android:windowBackground">@color/black</item>
         <item name="android:navigationBarColor">@color/black</item>
 
-        <item name="color_main1_100">@color/orange_main_100</item>
+        <item name="color_main1_100">@color/orange_main_900</item>
         <item name="color_main1_300">@color/orange_main_300</item>
         <item name="color_main1_500">@color/orange_main_500</item>
         <item name="color_main1_700">@color/orange_main_700</item>
 
         <item name="color_main2_000">@color/black</item>
-        <item name="color_main2_100">@color/gray_main2_100_night</item>
-        <item name="color_main2_200">@color/gray_main2_800</item>
+        <item name="color_main2_100">@color/gray_main2_800</item>
+        <item name="color_main2_200">@color/gray_main2_700</item>
         <item name="color_main2_300">@color/gray_main2_700</item>
-        <item name="color_main2_400">@color/gray_main2_600</item>
-        <item name="color_main2_500">@color/gray_main2_500</item>
-        <item name="color_main2_600">@color/gray_main2_400</item>
+        <item name="color_main2_400">@color/gray_main2_400</item>
+        <item name="color_main2_500">@color/gray_main2_300</item>
+        <item name="color_main2_600">@color/gray_main2_200</item>
         <item name="color_main2_700">@color/gray_main2_300</item>
         <item name="color_main2_800">@color/gray_main2_200</item>
         <item name="color_main2_900">@color/white</item>
 
         <item name="color_grey_100">@color/gray_900</item>
-        <item name="color_grey_200">@color/gray_800</item>
+        <item name="color_grey_200">@color/gray_600</item>
         <item name="color_grey_300">@color/gray_300</item>
         <item name="color_grey_400">@color/gray_600</item>
         <item name="color_grey_500">@color/gray_500</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bb2cdd383..b6e691b06 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="orange_main_300">#FFB266</color>
     <color name="orange_main_500">#FF5E00</color>
     <color name="orange_main_700">#B72D00</color>
+    <color name="orange_main_900">#662600</color>
 
     <color name="gray_main2_100">#EEF6F8</color>
     <color name="gray_main2_100_night">#191919</color>