diff --git a/app/src/main/res/color/in_call_button_tint_color.xml b/app/src/main/res/color/in_call_button_tint_color.xml
index 7ba9fea56..1eda9d9d7 100644
--- a/app/src/main/res/color/in_call_button_tint_color.xml
+++ b/app/src/main/res/color/in_call_button_tint_color.xml
@@ -1,6 +1,6 @@
 <?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_grey_500" />
-    <item android:state_pressed="true" android:color="?attr/color_main2_000" />
-    <item android:color="?attr/color_main2_000"/>
+    <item android:state_enabled="false" android:color="@color/gray_500" />
+    <item android:state_pressed="true" android:color="@color/white" />
+    <item android:color="@color/white"/>
 </selector>
diff --git a/app/src/main/res/drawable/circle_white_button_background.xml b/app/src/main/res/drawable/circle_white_button_background.xml
index e2feca243..83326874b 100644
--- a/app/src/main/res/drawable/circle_white_button_background.xml
+++ b/app/src/main/res/drawable/circle_white_button_background.xml
@@ -5,5 +5,5 @@
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_circle_white_pressed_background" />
     <item
-        android:drawable="@drawable/shape_circle_white_background" />
+        android:drawable="@drawable/shape_circle_white_call_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/linphone.xml b/app/src/main/res/drawable/linphone.xml
index 2a373a596..e0e8e1829 100644
--- a/app/src/main/res/drawable/linphone.xml
+++ b/app/src/main/res/drawable/linphone.xml
@@ -14,7 +14,7 @@
     <path
         android:name="path"
         android:pathData="M 53.893 48.839 C 56.543 45.357 58.459 41.276 59.39 36.828 C 51.515 43.716 41.339 47.882 30.236 47.882 C 19.111 47.882 9.047 43.873 1.173 36.976 C 4.074 50.479 15.993 60.599 30.266 60.599 C 36.279 60.598 41.87 58.797 46.551 55.708 C 49.343 57.294 56.667 61.285 57.624 60.051 C 58.282 59.201 56.671 55.692 56.671 55.692 L 53.893 48.839 Z M 59.301 21.99 C 59.189 21.455 58.702 20.063 58.702 20.063 C 54.383 8.89 42.981 0.963 30.318 0.963 L 30.245 0.963 C 24.273 0.963 18.582 2.728 13.782 5.763 C 11.591 4.504 3.17 -0.209 2.138 1.115 C 1.48 1.962 3.092 5.461 3.092 5.461 L 6.052 12.731 C 4.31 14.952 2.884 17.415 1.86 20.063 C 1.86 20.063 1.373 21.455 1.261 21.99 C 1.101 22.752 0.883 24.274 0.883 24.274 L 4.937 20.151 C 4.937 20.151 7.942 21.927 10.81 22.819 C 11.936 23.168 13.046 23.566 14.185 23.852 C 15.909 24.285 16.698 25.828 16.693 27.244 C 16.688 28.443 16.696 29.639 16.689 30.838 C 16.688 31.38 16.879 31.784 17.365 32.067 C 18.49 32.72 19.705 33.117 20.955 33.44 C 24.199 34.277 26.923 34.736 30.245 34.701 L 30.318 34.701 C 33.64 34.736 36.364 34.277 39.608 33.44 C 40.858 33.117 42.072 32.72 43.198 32.067 C 43.684 31.784 43.874 31.38 43.873 30.838 C 43.866 29.639 43.874 28.443 43.869 27.244 C 43.864 25.828 44.653 24.285 46.377 23.852 C 47.516 23.566 48.628 23.168 49.752 22.819 C 52.62 21.927 55.626 20.151 55.626 20.151 L 59.68 24.274 C 59.68 24.274 59.462 22.752 59.301 21.99"
-        android:fillColor="?attr/color_main1_500"
+        android:fillColor="@color/orange_main_500"
         android:strokeWidth="1"/>
   </group>
 </vector>
diff --git a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml
index 7e898c824..37ea330b5 100644
--- a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml
+++ b/app/src/main/res/drawable/shape_call_bottom_sheet_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:topRightRadius="20dp" android:topLeftRadius="20dp" />
-    <solid android:color="?attr/color_grey_800"/>
+    <solid android:color="@color/gray_800"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_circle_white_background.xml b/app/src/main/res/drawable/shape_circle_white_call_background.xml
similarity index 75%
rename from app/src/main/res/drawable/shape_circle_white_background.xml
rename to app/src/main/res/drawable/shape_circle_white_call_background.xml
index a73ea70ec..07f066002 100644
--- a/app/src/main/res/drawable/shape_circle_white_background.xml
+++ b/app/src/main/res/drawable/shape_circle_white_call_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="60dp" android:height="60dp" />
-    <solid android:color="?attr/color_main2_000"/>
+    <solid android:color="@color/white"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_in_call_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_button_background.xml
index 5ddeee1f7..97def84bb 100644
--- a/app/src/main/res/drawable/shape_round_in_call_button_background.xml
+++ b/app/src/main/res/drawable/shape_round_in_call_button_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="55dp" android:height="55dp" />
-    <solid android:color="?attr/color_grey_500"/>
+    <solid android:color="@color/gray_500"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml
index 6644edc2e..d242fd79e 100644
--- a/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml
+++ b/app/src/main/res/drawable/shape_round_in_call_disabled_button_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="55dp" android:height="55dp" />
-    <solid android:color="?attr/color_grey_600"/>
+    <solid android:color="@color/gray_600"/>
 </shape>
\ No newline at end of file
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 1c0bbc272..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="?attr/color_grey_600"/>
+    <solid android:color="@color/gray_600"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml
index 327ee432c..2ce614341 100644
--- a/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml
+++ b/app/src/main/res/drawable/shape_round_in_call_pressed_button_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="55dp" android:height="55dp" />
-    <solid android:color="?attr/color_main2_400"/>
+    <solid android:color="@color/gray_main2_400"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml b/app/src/main/res/drawable/shape_squircle_gray_600_top_call_background.xml
similarity index 78%
rename from app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml
rename to app/src/main/res/drawable/shape_squircle_gray_600_top_call_background.xml
index 48ecb5101..8a888a493 100644
--- a/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml
+++ b/app/src/main/res/drawable/shape_squircle_gray_600_top_call_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:topRightRadius="15dp" android:topLeftRadius="15dp" />
-    <solid android:color="?attr/color_grey_600"/>
+    <solid android:color="@color/gray_600"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_squircle_main2_200_border.xml b/app/src/main/res/drawable/shape_squircle_main2_200_call_border.xml
similarity index 71%
rename from app/src/main/res/drawable/shape_squircle_main2_200_border.xml
rename to app/src/main/res/drawable/shape_squircle_main2_200_call_border.xml
index ef2e9e813..891993dc0 100644
--- a/app/src/main/res/drawable/shape_squircle_main2_200_border.xml
+++ b/app/src/main/res/drawable/shape_squircle_main2_200_call_border.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" />
-    <stroke android:color="?attr/color_main2_200" android:width="3dp"/>
+    <stroke android:color="@color/gray_main2_200" android:width="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml
index e57ca4a9e..79bfd6145 100644
--- a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml
@@ -95,7 +95,7 @@
             android:gravity="center"
             android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="13sp"
             android:paddingBottom="2dp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml
index b3242a3c5..f73fad32a 100644
--- a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml
+++ b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml
@@ -71,7 +71,7 @@
             android:text="@{viewModel.letters1, default=`RV`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/letters_2"
@@ -89,7 +89,7 @@
             android:text="@{viewModel.letters2, default=`PT`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toEndOf="@id/letters_1"
             app:layout_constraintEnd_toStartOf="@id/letters_3"
@@ -106,7 +106,7 @@
             android:text="@{viewModel.letters3, default=`BB`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toEndOf="@id/letters_2"
             app:layout_constraintEnd_toStartOf="@id/letters_4"
@@ -122,7 +122,7 @@
             android:text="@{viewModel.letters4, default=`NM`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toEndOf="@id/letters_3"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/call_actions_bottom_sheet.xml b/app/src/main/res/layout/call_actions_bottom_sheet.xml
index 9e5b7413d..f5280b6b2 100644
--- a/app/src/main/res/layout/call_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_actions_bottom_sheet.xml
@@ -92,7 +92,7 @@
             android:gravity="center"
             android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="13sp"
             android:paddingBottom="2dp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout/call_active_conference_fragment.xml b/app/src/main/res/layout/call_active_conference_fragment.xml
index 177773a29..01fe199b3 100644
--- a/app/src/main/res/layout/call_active_conference_fragment.xml
+++ b/app/src/main/res/layout/call_active_conference_fragment.xml
@@ -37,7 +37,7 @@
             android:id="@+id/constraint_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/color_grey_900">
+            android:background="@color/gray_900">
 
             <ImageView
                 android:id="@+id/background"
@@ -86,11 +86,11 @@
                 android:background="@drawable/shape_squircle_main2_400_border"
                 android:text="@string/conference_share_link_title"
                 android:textSize="18sp"
-                android:textColor="?attr/color_main2_400"
+                android:textColor="@color/gray_main2_400"
                 android:visibility="@{conferenceViewModel.participantDevices.size() > 1 || viewModel.pipMode ? View.GONE : View.VISIBLE}"
                 android:drawableStart="@drawable/share_network"
                 android:drawablePadding="8dp"
-                app:drawableTint="?attr/color_main2_400"
+                app:drawableTint="@color/gray_main2_400"
                 app:layout_constraintTop_toBottomOf="@id/waiting_for_others"
                 app:layout_constraintStart_toStartOf="@id/background"
                 app:layout_constraintEnd_toEndOf="@id/background"/>
@@ -186,7 +186,7 @@
                 android:layout_marginEnd="10dp"
                 android:src="@drawable/camera_rotate"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE}"
-                app:tint="?attr/color_main2_000"
+                app:tint="@color/white"
                 app:layout_constraintTop_toTopOf="@id/conference_subject"
                 app:layout_constraintBottom_toBottomOf="@id/conference_subject"
                 app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml
index a16dc9ecc..68ba6b761 100644
--- a/app/src/main/res/layout/call_active_fragment.xml
+++ b/app/src/main/res/layout/call_active_fragment.xml
@@ -31,7 +31,7 @@
             android:id="@+id/constraint_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/color_grey_900">
+            android:background="@color/gray_900">
 
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/hinge_top"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
                 android:text="@{viewModel.displayedName, default=`John Doe`}"
-                android:textColor="?attr/color_main2_000"
+                android:textColor="@color/white"
                 android:textSize="22sp"
                 app:layout_constraintTop_toBottomOf="@id/avatar"
                 app:layout_constraintBottom_toTopOf="@id/address"
@@ -106,7 +106,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
-                android:textColor="?attr/color_main2_000"
+                android:textColor="@color/white"
                 android:textSize="14sp"
                 app:layout_constraintTop_toBottomOf="@id/name"
                 app:layout_constraintBottom_toBottomOf="@id/background"
@@ -213,7 +213,7 @@
                 android:layout_marginEnd="10dp"
                 android:src="@drawable/camera_rotate"
                 android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE}"
-                app:tint="?attr/color_main2_000"
+                app:tint="@color/white"
                 app:layout_constraintTop_toTopOf="@id/call_direction_label"
                 app:layout_constraintBottom_toBottomOf="@id/call_direction_label"
                 app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/call_activity_other_calls_top_bar.xml b/app/src/main/res/layout/call_activity_other_calls_top_bar.xml
index ca0937c61..d23af3eda 100644
--- a/app/src/main/res/layout/call_activity_other_calls_top_bar.xml
+++ b/app/src/main/res/layout/call_activity_other_calls_top_bar.xml
@@ -27,11 +27,11 @@
             android:layout_marginBottom="5dp"
             android:gravity="center_vertical"
             android:text="@{viewModel.otherCallsLabel, default=`John Doe`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="16sp"
             android:drawableStart="@drawable/pause_call"
             android:drawablePadding="10dp"
-            android:drawableTint="?attr/color_main2_000"
+            android:drawableTint="@color/white"
             app:layout_constraintEnd_toStartOf="@id/call_time"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -45,7 +45,7 @@
             android:layout_marginEnd="16dp"
             android:gravity="center_vertical"
             android:text="@{viewModel.otherCallsStatus, default=`Paused`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/call_display_name"
diff --git a/app/src/main/res/layout/call_audio_device_list_cell.xml b/app/src/main/res/layout/call_audio_device_list_cell.xml
index fdea0fb3a..e734f30dd 100644
--- a/app/src/main/res/layout/call_audio_device_list_cell.xml
+++ b/app/src/main/res/layout/call_audio_device_list_cell.xml
@@ -18,13 +18,13 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:text="@{model.name, default=`Speaker`}"
-        android:textColor="?attr/color_main2_000"
+        android:textColor="@color/white"
         android:gravity="center_vertical"
         android:layout_marginBottom="1dp"
         android:drawableEnd="@{model.type == Type.Speaker ? @drawable/speaker_high : model.type == Type.Bluetooth || model.type == Type.HearingAid ? @drawable/bluetooth : model.type == Type.Headphones || model.type == Type.Headset ? @drawable/headset : @drawable/ear, default=@drawable/speaker_high}"
-        android:drawableTint="?attr/color_main2_000"
+        android:drawableTint="@color/white"
         android:checked="@{model.isCurrentlySelected}"
         app:useMaterialThemeColors="false"
-        app:buttonTint="?attr/color_main2_000"/>
+        app:buttonTint="@color/white"/>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_audio_devices_menu.xml b/app/src/main/res/layout/call_audio_devices_menu.xml
index 585e8a2b9..40604b974 100644
--- a/app/src/main/res/layout/call_audio_devices_menu.xml
+++ b/app/src/main/res/layout/call_audio_devices_menu.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/shape_squircle_gray_600_top_background"
+        android:background="@drawable/shape_squircle_gray_600_top_call_background"
         entries="@{devices}"
         layout="@{@layout/call_audio_device_list_cell}">
 
diff --git a/app/src/main/res/layout/call_common_actions.xml b/app/src/main/res/layout/call_common_actions.xml
index 27d12e35e..5600b4db7 100644
--- a/app/src/main/res/layout/call_common_actions.xml
+++ b/app/src/main/res/layout/call_common_actions.xml
@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             android:padding="11dp"
             android:src="@drawable/shape_drawer_handle"
-            app:tint="?attr/color_main2_000"
+            app:tint="@color/white"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -43,7 +43,7 @@
             android:paddingBottom="15dp"
             android:src="@drawable/phone_disconnect"
             android:background="@drawable/squircle_red_button_background"
-            app:tint="?attr/color_main2_000"
+            app:tint="@color/white"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"/>
 
diff --git a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
index 512c203fc..13d571094 100644
--- a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
@@ -91,7 +91,7 @@
             android:gravity="center"
             android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="13sp"
             android:paddingBottom="2dp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout/call_conference_grid_cell.xml b/app/src/main/res/layout/call_conference_grid_cell.xml
index 2a830e2f0..c1c9d9f37 100644
--- a/app/src/main/res/layout/call_conference_grid_cell.xml
+++ b/app/src/main/res/layout/call_conference_grid_cell.xml
@@ -67,7 +67,7 @@
             android:layout_marginEnd="10dp"
             android:padding="2dp"
             android:src="@drawable/microphone_slash"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:visibility="@{model.isMuted ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -80,7 +80,7 @@
             android:layout_marginStart="12dp"
             android:layout_marginBottom="8dp"
             android:text="@{model.avatarModel.name, default=`John Doe`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
@@ -89,7 +89,7 @@
             android:id="@+id/speaking"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@drawable/shape_squircle_main2_200_border"
+            android:src="@drawable/shape_squircle_main2_200_call_border"
             android:visibility="@{model.isSpeaking ? View.VISIBLE : View.GONE}" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/call_conference_layout_menu.xml b/app/src/main/res/layout/call_conference_layout_menu.xml
index f6a490aa1..232c2318b 100644
--- a/app/src/main/res/layout/call_conference_layout_menu.xml
+++ b/app/src/main/res/layout/call_conference_layout_menu.xml
@@ -22,7 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/shape_squircle_gray_600_top_background">
+        android:background="@drawable/shape_squircle_gray_600_top_call_background">
 
         <com.google.android.material.radiobutton.MaterialRadioButton
             style="@style/context_menu_action_label_style"
@@ -32,14 +32,14 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@string/conference_layout_grid"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:gravity="center_vertical"
             android:layout_marginBottom="1dp"
             android:drawableEnd="@drawable/squares_four"
-            android:drawableTint="?attr/color_main2_000"
+            android:drawableTint="@color/white"
             android:checked="@{viewModel.conferenceLayout == 0}"
             app:useMaterialThemeColors="false"
-            app:buttonTint="?attr/color_main2_000"/>
+            app:buttonTint="@color/white"/>
 
         <com.google.android.material.radiobutton.MaterialRadioButton
             style="@style/context_menu_action_label_style"
@@ -49,14 +49,14 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@string/conference_layout_active_speaker"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:gravity="center_vertical"
             android:layout_marginBottom="1dp"
             android:drawableEnd="@drawable/picture_in_picture"
-            android:drawableTint="?attr/color_main2_000"
+            android:drawableTint="@color/white"
             android:checked="@{viewModel.conferenceLayout == 1}"
             app:useMaterialThemeColors="false"
-            app:buttonTint="?attr/color_main2_000"/>
+            app:buttonTint="@color/white"/>
 
         <com.google.android.material.radiobutton.MaterialRadioButton
             style="@style/context_menu_action_label_style"
@@ -66,14 +66,14 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@string/conference_layout_audio_only"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:gravity="center_vertical"
             android:layout_marginBottom="1dp"
             android:drawableEnd="@drawable/waveform"
-            android:drawableTint="?attr/color_main2_000"
+            android:drawableTint="@color/white"
             android:checked="@{viewModel.conferenceLayout == -1}"
             app:useMaterialThemeColors="false"
-            app:buttonTint="?attr/color_main2_000"/>
+            app:buttonTint="@color/white"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/call_ended_actions.xml b/app/src/main/res/layout/call_ended_actions.xml
index 6e31a7ce3..d0a0a8246 100644
--- a/app/src/main/res/layout/call_ended_actions.xml
+++ b/app/src/main/res/layout/call_ended_actions.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/call_main_actions_menu_height"
         android:paddingBottom="5dp"
-        android:background="?attr/color_grey_900">
+        android:background="@color/gray_900">
 
         <ImageView
             android:id="@+id/hang_up"
@@ -23,7 +23,7 @@
             android:paddingBottom="15dp"
             android:src="@drawable/phone_disconnect"
             android:background="@drawable/shape_squircle_red_disabled_background"
-            app:tint="?attr/color_grey_400"
+            app:tint="@color/gray_400"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"/>
 
diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml
index 8c6b0a076..33f2031b1 100644
--- a/app/src/main/res/layout/call_ended_fragment.xml
+++ b/app/src/main/res/layout/call_ended_fragment.xml
@@ -13,7 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/color_grey_900">
+        android:background="@color/gray_900">
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/single_call_group"
@@ -156,7 +156,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             android:text="@{viewModel.displayedName, default=`John Doe`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="22sp"
             app:layout_constraintTop_toBottomOf="@id/avatar"
             app:layout_constraintStart_toStartOf="parent"
@@ -168,7 +168,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="14sp"
             android:visibility="@{viewModel.conferenceModel.isCurrentCallInConference ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toBottomOf="@id/name"
diff --git a/app/src/main/res/layout/call_incoming_bottom_bar.xml b/app/src/main/res/layout/call_incoming_bottom_bar.xml
index a0e57e730..84ec4ac20 100644
--- a/app/src/main/res/layout/call_incoming_bottom_bar.xml
+++ b/app/src/main/res/layout/call_incoming_bottom_bar.xml
@@ -32,7 +32,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/answer_call"
             app:layout_constraintStart_toStartOf="parent"
-            app:tint="?attr/color_main2_000" />
+            app:tint="@color/white" />
 
         <ImageView
             android:id="@+id/answer_call"
@@ -48,7 +48,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/hang_up"
-            app:tint="?attr/color_main2_000" />
+            app:tint="@color/white" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/call_incoming_fragment.xml b/app/src/main/res/layout/call_incoming_fragment.xml
index 61df46f0d..891b8882c 100644
--- a/app/src/main/res/layout/call_incoming_fragment.xml
+++ b/app/src/main/res/layout/call_incoming_fragment.xml
@@ -14,7 +14,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/color_grey_900">
+        android:background="@color/gray_900">
 
         <ImageView
             android:id="@+id/call_direction_icon"
@@ -89,7 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:indeterminate="true"
-            app:indicatorColor="?attr/color_main2_000"
+            app:indicatorColor="@color/white"
             app:layout_constraintBottom_toTopOf="@id/chronometer"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -99,7 +99,7 @@
             android:id="@+id/chronometer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="30sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -113,7 +113,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             android:text="@{viewModel.displayedName, default=`John Doe`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="22sp"
             app:layout_constraintTop_toBottomOf="@id/avatar"
             app:layout_constraintStart_toStartOf="parent"
@@ -125,7 +125,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="14sp"
             android:visibility="@{viewModel.conferenceModel.isCurrentCallInConference ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toBottomOf="@id/name"
diff --git a/app/src/main/res/layout/call_numpad_bottom_sheet.xml b/app/src/main/res/layout/call_numpad_bottom_sheet.xml
index da01ed850..a86deb752 100644
--- a/app/src/main/res/layout/call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_numpad_bottom_sheet.xml
@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"
             android:padding="11dp"
             android:src="@drawable/shape_drawer_handle"
-            app:tint="?attr/color_main2_000"
+            app:tint="@color/white"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -42,7 +42,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="30dp"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="30sp"
             android:text="@{model.digits, default=`0123456789`}"
             android:background="@color/transparent_color"
@@ -64,7 +64,7 @@
             android:src="@drawable/backspace_fill"
             android:padding="20dp"
             android:elevation="3dp"
-            app:tint="?attr/color_main2_000"
+            app:tint="@color/white"
             app:layout_constraintTop_toBottomOf="@id/handle"
             app:layout_constraintStart_toEndOf="@id/digits_history"
             app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml
index 96e1679b4..3138aea26 100644
--- a/app/src/main/res/layout/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout/call_outgoing_fragment.xml
@@ -14,7 +14,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/color_grey_900">
+        android:background="@color/gray_900">
 
         <ImageView
             android:id="@+id/call_direction_icon"
@@ -63,7 +63,7 @@
             app:layout_constraintTop_toTopOf="@id/call_direction_label"
             app:layout_constraintBottom_toBottomOf="@id/call_direction_label"
             app:layout_constraintEnd_toEndOf="parent"
-            app:tint="?attr/color_main2_000" />
+            app:tint="@color/white" />
 
         <ImageView
             android:id="@+id/background"
@@ -103,7 +103,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:indeterminate="true"
-            app:indicatorColor="?attr/color_main2_000"
+            app:indicatorColor="@color/white"
             app:layout_constraintBottom_toTopOf="@id/chronometer"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -113,7 +113,7 @@
             android:id="@+id/chronometer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="30sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -127,7 +127,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             android:text="@{viewModel.displayedName, default=`John Doe`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="22sp"
             app:layout_constraintTop_toBottomOf="@id/avatar"
             app:layout_constraintStart_toStartOf="parent"
@@ -139,7 +139,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
-            android:textColor="?attr/color_main2_000"
+            android:textColor="@color/white"
             android:textSize="14sp"
             app:layout_constraintTop_toBottomOf="@id/name"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
index 786e70ca4..1e1f8db2c 100644
--- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
+++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
@@ -71,7 +71,7 @@
             android:text="@{viewModel.letters1, default=`RV`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/letters_2"
@@ -88,7 +88,7 @@
             android:text="@{viewModel.letters2, default=`PT`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toEndOf="@id/letters_1"
             app:layout_constraintEnd_toEndOf="parent"
@@ -106,7 +106,7 @@
             android:text="@{viewModel.letters3, default=`BB`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/letters_4"
@@ -123,7 +123,7 @@
             android:text="@{viewModel.letters4, default=`NM`}"
             android:textSize="32sp"
             android:gravity="center"
-            android:background="@drawable/shape_circle_white_background"
+            android:background="@drawable/shape_circle_white_call_background"
             android:elevation="5dp"
             app:layout_constraintStart_toEndOf="@id/letters_3"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 74e7f80c8..ee04ba422 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,8 +1,14 @@
 <resources>
+    <style name="AppSplashScreenTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/black</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/linphone</item>
+        <item name="postSplashScreenTheme">@style/Theme.Linphone</item>
+    </style>
     <!-- Base application theme. -->
     <style name="Theme.Linphone" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/orange_main_500</item>
+        <item name="colorSurface">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/orange_main_500</item>
         <!-- https://developer.android.com/guide/topics/display-cutout#best_practices_for_display_cutout_support -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bfb0ee4ce..e1745f19b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -43,7 +43,7 @@
     </style>
     <style name="call_header_style">
         <item name="android:fontFamily">@font/noto_sans_800</item>
-        <item name="android:textColor">?attr/color_main2_000</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:textSize">16sp</item>
     </style>
     <style name="section_header_style">
@@ -127,7 +127,7 @@
     </style>
     <style name="call_numpad_digits_style">
         <item name="android:fontFamily">@font/noto_sans</item>
-        <item name="android:textColor">?attr/color_main2_000</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:textSize">32sp</item>
         <item name="android:gravity">center</item>
         <item name="android:elevation">3dp</item>
@@ -136,7 +136,7 @@
     <style name="in_call_extra_action_label_style">
         <item name="android:fontFamily">@font/noto_sans</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?attr/color_main2_000</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:gravity">center</item>
         <item name="maxLines">1</item>
         <item name="android:ellipsize">end</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 06d96a148..c32574862 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,14 +1,15 @@
 <resources>
-    <!-- Base application theme. -->
     <style name="AppSplashScreenTheme" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/white</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/linphone</item>
         <item name="postSplashScreenTheme">@style/Theme.Linphone</item>
     </style>
 
+    <!-- Base application theme. -->
     <style name="Theme.Linphone" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/orange_main_500</item>
+        <item name="colorSurface">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/orange_main_500</item>
         <!-- https://developer.android.com/guide/topics/display-cutout#best_practices_for_display_cutout_support -->