diff --git a/app/src/main/java/org/linphone/ui/assistant/adapter/CountryPickerAdapter.kt b/app/src/main/java/org/linphone/ui/assistant/adapter/CountryPickerAdapter.kt
index d08872b58..7abbe6c9c 100644
--- a/app/src/main/java/org/linphone/ui/assistant/adapter/CountryPickerAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/adapter/CountryPickerAdapter.kt
@@ -48,6 +48,9 @@ class CountryPickerAdapter : BaseAdapter(), Filterable {
         )
         val dialPlan: DialPlan = countries[position]
 
+        val flag = view.findViewById<TextView>(R.id.country_flag)
+        flag.text = dialPlan.flag
+
         val name = view.findViewById<TextView>(R.id.country_name)
         name.text = dialPlan.country
 
diff --git a/app/src/main/res/drawable/led_not_registered.xml b/app/src/main/res/drawable/led_not_registered.xml
index cba3b5854..5aebe3eda 100644
--- a/app/src/main/res/drawable/led_not_registered.xml
+++ b/app/src/main/res/drawable/led_not_registered.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">
-    <solid android:color="@color/gray_offline"/>
+    <solid android:color="@color/gray_main2_400"/>
     <size android:width="15dp" android:height="15dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml b/app/src/main/res/drawable/shape_round_in_call_gray_background.xml
index d4c1aa060..62367e1b1 100644
--- a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml
+++ b/app/src/main/res/drawable/shape_round_in_call_gray_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="rectangle">
     <corners android:radius="20dp" />
-    <solid android:color="@color/in_call_gray"/>
+    <solid android:color="@color/gray_600"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/voip_call_extra_actions.xml b/app/src/main/res/layout-land/voip_call_extra_actions.xml
index 336bcf291..9e54a093e 100644
--- a/app/src/main/res/layout-land/voip_call_extra_actions.xml
+++ b/app/src/main/res/layout-land/voip_call_extra_actions.xml
@@ -22,7 +22,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/in_call_all_actions_menu_height"
-        android:background="@color/in_call_black"
+        android:background="@color/grey_900"
         app:behavior_hideable="false"
         app:behavior_peekHeight="@dimen/in_call_main_actions_menu_height"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
diff --git a/app/src/main/res/layout/assistant_country_picker_cell.xml b/app/src/main/res/layout/assistant_country_picker_cell.xml
index d003a8e68..e6ec9e8e2 100644
--- a/app/src/main/res/layout/assistant_country_picker_cell.xml
+++ b/app/src/main/res/layout/assistant_country_picker_cell.xml
@@ -6,11 +6,21 @@
     android:orientation="horizontal"
     android:padding="5dp">
 
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style"
+        android:id="@+id/country_flag"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp" />
+
     <androidx.appcompat.widget.AppCompatTextView
         style="@style/default_text_style"
         android:id="@+id/country_name"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp" />
 
     <androidx.appcompat.widget.AppCompatTextView
         style="@style/default_text_style"
diff --git a/app/src/main/res/layout/voip_active_call_fragment.xml b/app/src/main/res/layout/voip_active_call_fragment.xml
index c48628178..07a048b70 100644
--- a/app/src/main/res/layout/voip_active_call_fragment.xml
+++ b/app/src/main/res/layout/voip_active_call_fragment.xml
@@ -27,7 +27,7 @@
             android:id="@+id/constraint_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/in_call_black">
+            android:background="@color/grey_900">
 
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/hinge_top"
diff --git a/app/src/main/res/layout/voip_call_extra_actions.xml b/app/src/main/res/layout/voip_call_extra_actions.xml
index c97d3acda..2b8f4ad32 100644
--- a/app/src/main/res/layout/voip_call_extra_actions.xml
+++ b/app/src/main/res/layout/voip_call_extra_actions.xml
@@ -22,7 +22,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/in_call_all_actions_menu_height"
-        android:background="@color/in_call_black"
+        android:background="@color/grey_900"
         app:behavior_hideable="false"
         app:behavior_peekHeight="@dimen/in_call_main_actions_menu_height"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
diff --git a/app/src/main/res/layout/voip_call_main_actions.xml b/app/src/main/res/layout/voip_call_main_actions.xml
index e6f1b0f48..cae3a1548 100644
--- a/app/src/main/res/layout/voip_call_main_actions.xml
+++ b/app/src/main/res/layout/voip_call_main_actions.xml
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/in_call_main_actions_menu_height"
         android:paddingBottom="5dp"
-        android:background="@color/in_call_black">
+        android:background="@color/grey_900">
 
         <com.google.android.material.bottomsheet.BottomSheetDragHandleView
             android:onClick="@{() -> viewModel.toggleExpandActionsMenu()}"
diff --git a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
index b90dde725..bf48ff07f 100644
--- a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
+++ b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
@@ -12,7 +12,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/in_call_black"
+        android:background="@color/grey_900"
         android:paddingTop="15dp"
         android:paddingBottom="15dp">
 
diff --git a/app/src/main/res/layout/voip_incoming_call_fragment.xml b/app/src/main/res/layout/voip_incoming_call_fragment.xml
index f33ccd2fc..391a9b62d 100644
--- a/app/src/main/res/layout/voip_incoming_call_fragment.xml
+++ b/app/src/main/res/layout/voip_incoming_call_fragment.xml
@@ -13,7 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/in_call_black">
+        android:background="@color/grey_900">
 
         <ImageView
             android:id="@+id/call_direction_icon"
diff --git a/app/src/main/res/layout/voip_outgoing_call_fragment.xml b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
index e106ff031..c1735e2c2 100644
--- a/app/src/main/res/layout/voip_outgoing_call_fragment.xml
+++ b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
@@ -13,7 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/in_call_black">
+        android:background="@color/grey_900">
 
         <ImageView
             android:id="@+id/call_direction_icon"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a65b209f8..aee0183f0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,6 +25,8 @@
     <color name="gray_300">#C9C9C9</color>
     <color name="gray_400">#949494</color>
     <color name="gray_500">#4E4E4E</color>
+    <color name="gray_600">#2E3030</color>
+    <color name="grey_900">#070707</color>
 
     <color name="red_danger_200">#F5CCBE</color>
     <color name="red_danger_500">#DD5F5F</color>
@@ -37,8 +39,5 @@
     <color name="blue_info_500">#4AA8FF</color>
 
     <color name="orange_away">#FFA645</color>
-    <color name="gray_offline">#E1E1E1</color>
     <color name="transparent_light_orange">#1ABF4601</color>
-    <color name="in_call_black">#070707</color>
-    <color name="in_call_gray">#2E3030</color>
 </resources>
\ No newline at end of file