diff --git a/app/src/main/res/color/grey_300.xml b/app/src/main/res/color/grey_300.xml
deleted file mode 100644
index 4ee296cd9..000000000
--- a/app/src/main/res/color/grey_300.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/color_black.xml b/app/src/main/res/drawable/color_black.xml
new file mode 100644
index 000000000..582fd4384
--- /dev/null
+++ b/app/src/main/res/drawable/color_black.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/color_danger_500.xml b/app/src/main/res/drawable/color_danger_500.xml
new file mode 100644
index 000000000..ead3b5478
--- /dev/null
+++ b/app/src/main/res/drawable/color_danger_500.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/color_main1_500.xml b/app/src/main/res/drawable/color_main1_500.xml
new file mode 100644
index 000000000..501b22acb
--- /dev/null
+++ b/app/src/main/res/drawable/color_main1_500.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/color_main2_000.xml b/app/src/main/res/drawable/color_main2_000.xml
new file mode 100644
index 000000000..2da346242
--- /dev/null
+++ b/app/src/main/res/drawable/color_main2_000.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/color_main2_100.xml b/app/src/main/res/drawable/color_main2_100.xml
new file mode 100644
index 000000000..9d9c60158
--- /dev/null
+++ b/app/src/main/res/drawable/color_main2_100.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/color_main2_500.xml b/app/src/main/res/drawable/color_main2_500.xml
new file mode 100644
index 000000000..41f327408
--- /dev/null
+++ b/app/src/main/res/drawable/color_main2_500.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/color_success_500.xml b/app/src/main/res/drawable/color_success_500.xml
new file mode 100644
index 000000000..8a8ee1bec
--- /dev/null
+++ b/app/src/main/res/drawable/color_success_500.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/primary_cell_background.xml b/app/src/main/res/drawable/primary_cell_background.xml
index 5e8211efa..2f9a9ca58 100644
--- a/app/src/main/res/drawable/primary_cell_background.xml
+++ b/app/src/main/res/drawable/primary_cell_background.xml
@@ -1,9 +1,9 @@
+ android:drawable="@drawable/color_main2_100" />
+ android:drawable="@drawable/color_main2_100" />
+ android:drawable="@drawable/color_main2_000" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/secondary_cell_background.xml b/app/src/main/res/drawable/secondary_cell_background.xml
index b9bc2752a..8d2657fce 100644
--- a/app/src/main/res/drawable/secondary_cell_background.xml
+++ b/app/src/main/res/drawable/secondary_cell_background.xml
@@ -1,9 +1,9 @@
+ android:drawable="@drawable/color_main2_100" />
+ android:drawable="@drawable/color_main2_100" />
\ 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 f955eb343..af64e2a6f 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
@@ -143,7 +143,7 @@
android:layout_height="0dp"
android:indeterminate="true"
android:visibility="@{viewModel.operationInProgress ? View.VISIBLE : View.GONE}"
- app:indicatorColor="@color/main1_500"
+ app:indicatorColor="?attr/color_main1_500"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/chat"
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 230f5430f..2af0f6afe 100644
--- a/app/src/main/res/layout-land/chat_list_fragment.xml
+++ b/app/src/main/res/layout-land/chat_list_fragment.xml
@@ -104,7 +104,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
- app:indicatorColor="@color/main1_500"
+ app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="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 9899bd000..ff56cf270 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -142,7 +142,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
- app:indicatorColor="@color/main1_500"
+ app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="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 8e1a526c7..86f8d6f1e 100644
--- a/app/src/main/res/layout-land/history_list_fragment.xml
+++ b/app/src/main/res/layout-land/history_list_fragment.xml
@@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
- app:indicatorColor="@color/main1_500"
+ app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
index a8aa019f5..5460fdd16 100644
--- a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
@@ -34,7 +34,7 @@
android:padding="15dp"
android:src="@drawable/caret_left"
android:contentDescription="@string/content_description_go_back_icon"
- app:tint="@color/main1_500"
+ app:tint="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="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 f3bb40661..0f02cd2fb 100644
--- a/app/src/main/res/layout-land/meetings_list_fragment.xml
+++ b/app/src/main/res/layout-land/meetings_list_fragment.xml
@@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
- app:indicatorColor="@color/main1_500"
+ app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout-land/welcome_page_1.xml b/app/src/main/res/layout-land/welcome_page_1.xml
index 357f06474..89f90e205 100644
--- a/app/src/main/res/layout-land/welcome_page_1.xml
+++ b/app/src/main/res/layout-land/welcome_page_1.xml
@@ -21,7 +21,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
- app:tint="@color/main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ android:background="@{model.isDefault ? @drawable/color_main2_100 : @drawable/color_main2_000, default=@drawable/color_main2_100}">
+ app:tint="?attr/color_main1_500" />
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml
index 982b2cc0e..8f2665606 100644
--- a/app/src/main/res/layout/call_active_fragment.xml
+++ b/app/src/main/res/layout/call_active_fragment.xml
@@ -211,7 +211,7 @@
android:src="@drawable/pause"
android:contentDescription="@string/content_description_paused_call"
android:visibility="@{!viewModel.fullScreenMode && !viewModel.pipMode && (viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE, default=gone}"
- app:tint="@color/main1_500"
+ app:tint="?attr/color_main1_500"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintEnd_toStartOf="@id/stats" />
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 c1940276b..e7a025c55 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
@@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="40dp"
- android:background="@{viewModel.callsCount > 1 || viewModel.showTopBar ? @color/success_500 : @color/black, default=@color/black}"
+ android:background="@{viewModel.callsCount > 1 || viewModel.showTopBar ? @drawable/color_success_500 : @drawable/color_black, default=@drawable/color_black}"
android:onClick="@{() -> viewModel.topBarClicked()}">
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 4e8137d6c..70c047db6 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -131,7 +131,7 @@
app:layout_constraintEnd_toStartOf="@id/ephemeral_enabled"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toBottomOf="@id/avatar"
- app:tint="@color/main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500" />
diff --git a/app/src/main/res/layout/meetings_list_fragment.xml b/app/src/main/res/layout/meetings_list_fragment.xml
index 6591b77e8..c930a881c 100644
--- a/app/src/main/res/layout/meetings_list_fragment.xml
+++ b/app/src/main/res/layout/meetings_list_fragment.xml
@@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
- app:indicatorColor="@color/main1_500"
+ app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/recordings_list_fragment.xml b/app/src/main/res/layout/recordings_list_fragment.xml
index 88620334f..e6b4d8ebc 100644
--- a/app/src/main/res/layout/recordings_list_fragment.xml
+++ b/app/src/main/res/layout/recordings_list_fragment.xml
@@ -171,7 +171,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
- app:indicatorColor="@color/main1_500"
+ app:indicatorColor="?attr/color_main1_500"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/single_sign_on_fragment.xml b/app/src/main/res/layout/single_sign_on_fragment.xml
index 3a61d8b79..9f3b13863 100644
--- a/app/src/main/res/layout/single_sign_on_fragment.xml
+++ b/app/src/main/res/layout/single_sign_on_fragment.xml
@@ -43,7 +43,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
- app:tint="@color/main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>
+ app:tint="?attr/color_main1_500"/>