diff --git a/vector/src/main/res/drawable/direct_chat_circle_black.xml b/vector/src/main/res/drawable/direct_chat_circle_black.xml
deleted file mode 100644
index 3c45c0231f..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_black.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/direct_chat_circle_dark.xml b/vector/src/main/res/drawable/direct_chat_circle_dark.xml
deleted file mode 100644
index 1e9a4500f4..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_dark.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/direct_chat_circle_light.xml b/vector/src/main/res/drawable/direct_chat_circle_light.xml
deleted file mode 100644
index 88bb178a9b..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/direct_chat_circle_status.xml b/vector/src/main/res/drawable/direct_chat_circle_status.xml
deleted file mode 100644
index 2d527d0b4d..0000000000
--- a/vector/src/main/res/drawable/direct_chat_circle_status.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index dd2fbfce7a..c6a81b8948 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -15,25 +15,17 @@
-
-
-
-
-
-
-
-
@@ -42,51 +34,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 0c78469c3d..f3844b7baa 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -73,16 +73,10 @@
- #FF090A0C
-
- - @color/primary_color_black
-
- - @color/primary_color_dark_black
- @color/riotx_list_bottom_sheet_divider_color_black
- @color/riotx_header_panel_background_black
- - @color/list_divider_color_black
-
- #FF4D4D4D
- @drawable/pill_receipt_black
@@ -91,8 +85,6 @@
- @color/riot_primary_background_color_black
- @color/riotx_bottom_nav_background_color_black
- @color/riotx_bottom_nav_background_border_color_black
-
- - @drawable/direct_chat_circle_black
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index a391e48cfb..42e346b449 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -86,37 +86,21 @@
- @color/primary_hint_text_color_dark
- - @color/primary_color_dark
- - @color/primary_color_dark_dark
-
- @color/default_text_hint_color_dark
-
- - #FF2E3648
- #61708B
- @color/vector_fuchsia_color
- @android:color/white
- @color/riot_primary_text_color_dark
- @color/accent_color_dark
- @color/riotx_text_secondary_dark
- - @color/vector_fuchsia_color
- - @color/primary_color_light
- - #CCC3C3C3
- - @color/accent_color_dark
- @android:color/black
- #FFFFFFFF
- - #565656
- ?colorPrimary
- -
- @color/tab_bar_selected_background_color_dark
-
- -
- @color/tab_bar_unselected_background_color_dark
-
@@ -129,20 +113,9 @@
- @color/riotx_list_bottom_sheet_divider_color_dark
- @color/riotx_header_panel_background_dark
- - @color/list_divider_color_dark
-
-
- - #80000000
-
- #33FFFFFF
-
- - #4d4d4d
-
-
- - @color/riot_primary_text_color_dark
-
- #FF61708b
@@ -150,33 +123,13 @@
- @android:color/white
- @color/riotx_accent
- - @android:color/white
- @drawable/line_divider_dark
- - @drawable/shadow_bottom_dark
- - @drawable/shadow_top_dark
- -
- @drawable/vector_tabbar_selected_background_dark
-
- -
- @drawable/vector_tabbar_unselected_background_dark
-
- - @drawable/vector_tabbar_background_dark
-
- - @drawable/pill_background_user_id_dark
- - @drawable/pill_background_room_alias_dark
-
- - @android:color/white
- - @color/riot_primary_text_color_dark
- @drawable/pill_receipt_dark
- - @drawable/direct_chat_circle_dark
-
- - #FF454545
-
- never
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index cfd7b7cc81..2234b8e183 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -86,37 +86,21 @@
- @color/primary_hint_text_color_light
- - @color/primary_color_light
- - @color/primary_color_dark_light
-
- @color/default_text_hint_color_light
-
- - #FF2E3648
- #61708B
- @color/vector_fuchsia_color
- @color/riot_primary_text_color_light
- #FF61708b
- @color/accent_color_light
- @color/riotx_text_secondary_light
- - @color/vector_fuchsia_color
- - @color/primary_color_light
- - #333C3C3C
- - @color/accent_color_light
- #FFEEEEEE
- #FF000000
- - #FFF2F2F2
- #FFF2F2F2
- -
- @color/tab_bar_selected_background_color_light
-
- -
- @color/tab_bar_unselected_background_color_light
-
@@ -129,20 +113,9 @@
- @color/riotx_list_bottom_sheet_divider_color_light
- @color/riotx_header_panel_background_light
- - @color/list_divider_color_light
-
-
- - #80ffffff
-
- #33000000
-
- - #FFF2F2F2
-
-
- - @color/riot_primary_text_color_light
-
- #FF61708b
@@ -150,33 +123,13 @@
- @android:color/black
- @color/riotx_accent
- - @android:color/white
- @drawable/line_divider_light
- - @drawable/shadow_bottom_light
- - @drawable/shadow_top_light
- -
- @drawable/vector_tabbar_selected_background_light
-
- -
- @drawable/vector_tabbar_unselected_background_light
-
- - @drawable/vector_tabbar_background_light
-
- - @drawable/pill_background_user_id_light
- - @drawable/pill_background_room_alias_light
-
- - @color/riot_primary_text_color_light
- - @android:color/white
- @drawable/pill_receipt_light
- - @drawable/direct_chat_circle_light
-
- - #FFD3EFE1
-
- never
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index 06394ad049..cebab7dedd 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -36,83 +36,39 @@
- @color/primary_hint_text_color_light
- - @color/primary_color_status
- - @color/primary_color_dark_status
-
- @color/default_text_hint_color_light
- - ?colorAccent
- #61708B
- #FFFF4444
- #70879d
- #adadbe
- #AECDF9
- #b3e8d2
- - @color/vector_fuchsia_color
- - @color/primary_color_status
- - #333C3C3C
- - #AECDF9
- #FFEEEEEE
- - #FFF2F2F2
- #FFF2F2F2
- -
- @color/tab_bar_selected_background_color_status
-
- -
- @color/tab_bar_unselected_background_color_status
-
- #FFF6F6F6
- #7F3C3C3C
- #4D3C3C3C
-
- - #80ffffff
-
- #33000000
-
- - #FFF2F2F2
-
-
- - @color/riot_primary_text_color_status
-
- #a0a29f
- @color/accent_color_status
- @color/riotx_accent
- - @android:color/white
- @drawable/line_divider_light
- - @drawable/shadow_bottom_light
- - @drawable/shadow_top_light
- -
- @drawable/vector_tabbar_selected_background_status
-
- -
- @drawable/vector_tabbar_unselected_background_status
-
- - @drawable/vector_tabbar_background_status
-
- - @drawable/pill_background_user_id_status
- - @drawable/pill_background_room_alias_status
-
- - @color/riot_primary_text_color_status
- - @android:color/white
-
- - @drawable/direct_chat_circle_status
-
- - #FFF7F7F7