diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 2347d84ee3..78a0139e1d 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -75,7 +75,6 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
                     android:hint="@string/send_bug_report_placeholder"
-                    android:textColorHint="?attr/vctr_default_text_hint_color"
                     app:counterEnabled="true"
                     app:counterMaxLength="500">
 
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 9561c59301..10c9dcd59b 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -39,7 +39,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:layout_constraintEnd_toStartOf="@+id/exportDialogShowPassword"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/exportDialogText">
@@ -61,7 +60,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:errorEnabled="true"
         app:layout_constraintEnd_toEndOf="@+id/exportDialogTil"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index 68621f8230..177dbd1f66 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -29,7 +29,6 @@
         style="@style/VectorTextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:layout_constraintEnd_toStartOf="@+id/importDialogShowPassword"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/dialog_e2e_keys_passphrase_filename">
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 0cf346a4b4..94a43037ae 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -6,9 +6,6 @@
     <attr name="vctr_toolbar_secondary_text_color" format="color" />
     <attr name="vctr_toolbar_link_text_color" format="color" />
 
-    <!-- default text colors -->
-    <attr name="vctr_default_text_hint_color" format="color" />
-
     <!-- room message colors -->
     <attr name="vctr_unsent_message_text_color" format="color" />
     <attr name="vctr_message_text_color" format="color" />
@@ -19,9 +16,6 @@
     <attr name="vctr_markdown_block_background_color" format="color" />
     <attr name="vctr_spoiler_background_color" format="color" />
 
-    <!-- tab bar colors -->
-    <attr name="vctr_tab_bar_inverted_background_color" format="color" />
-
     <!-- list colors -->
     <attr name="vctr_list_header_background_color" format="color" />
     <attr name="vctr_list_header_primary_text_color" format="color" />
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 01379eee70..7561e6f843 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -171,11 +171,6 @@
     <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
     <color name="riotx_bottom_sheet_background_black">#FF282C35</color>
 
-    <attr name="riotx_search_background_mobile" format="color" />
-    <color name="riotx_search_background_mobile_light">#FFFFFFFF</color>
-    <color name="riotx_search_background_mobile_dark">#FF181B21</color>
-    <color name="riotx_search_background_mobile_black">#FF181B21</color>
-
     <attr name="riotx_header_panel_background" format="color" />
     <color name="riotx_header_panel_background_light">#FFF3F8FD</color>
     <color name="riotx_header_panel_background_dark">#FF22262E</color>
@@ -186,11 +181,6 @@
     <color name="riotx_header_panel_border_mobile_dark">#FF181B21</color>
     <color name="riotx_header_panel_border_mobile_black">#FF0D0F12</color>
 
-    <attr name="riotx_header_panel_text_primary" format="color" />
-    <color name="riotx_header_panel_text_primary_light">#FF171910</color>
-    <color name="riotx_header_panel_text_primary_dark">#FFFFFFFF</color>
-    <color name="riotx_header_panel_text_primary_black">#FFFFFFFF</color>
-
     <attr name="riotx_header_panel_text_secondary" format="color" />
     <color name="riotx_header_panel_text_secondary_light">#8F97A3</color>
     <color name="riotx_header_panel_text_secondary_dark">#FFA9B2BC</color>
@@ -223,47 +213,17 @@
     <color name="riotx_android_secondary_dark">#FF8F97A3</color>
     <color name="riotx_android_secondary_black">#FFA9B2BC</color>
 
-    <attr name="riotx_search_placeholder" format="color" />
-    <color name="riotx_search_placeholder_light">#FF8F97A3</color>
-    <color name="riotx_search_placeholder_dark">#FFA9B2BC</color>
-    <color name="riotx_search_placeholder_black">#FFA9B2BC</color>
-
-    <attr name="riotx_room_highlight" format="color" />
-    <color name="riotx_room_highlight_light">#FFF6F7F8</color>
-    <color name="riotx_room_highlight_dark">#FF343446</color>
-    <color name="riotx_room_highlight_black">#FF343446</color>
-
     <attr name="riotx_unread_room_indent" format="color" />
     <color name="riotx_unread_room_indent_light">#FF2E3648</color>
     <color name="riotx_unread_room_indent_dark">#FF2E3648</color>
     <color name="riotx_unread_room_indent_black">#FF2E3648</color>
 
-    <attr name="riotx_android_status_bar" format="color" />
-    <color name="riotx_android_status_bar_light">#FF2E3648</color>
-    <color name="riotx_android_status_bar_dark">#FF0D0E10</color>
-    <color name="riotx_android_status_bar_black">#FF0D0E10</color>
-
-    <attr name="riotx_line_break_mobile" format="color" />
-    <color name="riotx_line_break_mobile_light">#FFEEEFEF</color>
-    <color name="riotx_line_break_mobile_dark">#FF61708B</color>
-    <color name="riotx_line_break_mobile_black">#FF61708B</color>
-
     <!-- Other colors, which are not in the pallette -->
     <attr name="riotx_unread_room_badge" format="color" />
     <color name="riotx_unread_room_badge_light">#FF61708B</color>
     <color name="riotx_unread_room_badge_dark">#FF61708B</color>
     <color name="riotx_unread_room_badge_black">#FF61708B</color>
 
-    <attr name="riotx_fab_secondary_bg" format="color" />
-    <color name="riotx_fab_secondary_bg_light">@color/white</color>
-    <color name="riotx_fab_secondary_bg_dark">#FF181B21</color>
-    <color name="riotx_fab_secondary_bg_black">#FF181B21</color>
-
-    <attr name="riotx_fab_secondary_color" format="color" />
-    <color name="riotx_fab_secondary_color_light">@color/black</color>
-    <color name="riotx_fab_secondary_color_dark">@color/white</color>
-    <color name="riotx_fab_secondary_color_black">@color/white</color>
-
     <attr name="riotx_fab_label_bg" format="color" />
     <color name="riotx_fab_label_bg_light">@color/white</color>
     <color name="riotx_fab_label_bg_dark">#FF181B21</color>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index f7efcd8f86..bf74dd86fa 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -227,18 +227,6 @@
         <item name="tabMaxWidth">0dp</item>
     </style>
 
-    <style name="VectorUnifiedSearches.TabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabGravity">fill</item>
-        <item name="tabMode">fixed</item>
-        <item name="tabPaddingStart">0dp</item>
-        <item name="tabPaddingEnd">0dp</item>
-        <item name="tabBackground">?attr/vctr_tab_bar_inverted_background_color</item>
-        <item name="tabTextColor">?attr/colorAccent</item>
-        <item name="tabSelectedTextColor">?attr/colorAccent</item>
-        <item name="tabIndicatorColor">?attr/colorAccent</item>
-        <item name="tabMaxWidth">0dp</item>
-    </style>
-
     <style name="ListHeader">
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">?vctr_list_header_primary_text_color</item>
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 0d487127d6..8a03e29375 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -9,24 +9,16 @@
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_black</item>
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_black</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_black</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_black</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_black</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_black</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_black</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_black</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_black</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_black</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_black</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_black</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_black</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_black</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_black</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_black</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_black</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_black</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_black</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_black</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_black</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_black</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_black</item>
@@ -39,8 +31,6 @@
         <item name="riotx_reaction_background_on">@color/riotx_reaction_background_on_black</item>
         <item name="riotx_alerter_background">@color/riotx_alerter_background_black</item>
 
-        <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_black</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index bf4793033c..24500f6d78 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -7,24 +7,16 @@
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_dark</item>
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_dark</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_dark</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_dark</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_dark</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_dark</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_dark</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_dark</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_dark</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_dark</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_dark</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_dark</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_dark</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_dark</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_dark</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_dark</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_dark</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_dark</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_dark</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_dark</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_dark</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
@@ -82,9 +74,6 @@
         <item name="vctr_toolbar_secondary_text_color">@color/riot_secondary_text_color_dark</item>
         <item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
 
-        <!-- default text colors -->
-        <item name="vctr_default_text_hint_color">@color/default_text_hint_color_dark</item>
-
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
@@ -98,9 +87,6 @@
         <item name="riot_primary_text_color">@color/riot_primary_text_color_dark</item>
         <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_dark</item>
 
-        <!-- tab bar colors -->
-        <item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item>
-
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">@color/primary_color_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index dc7a16b9ba..d0e33959c1 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -7,24 +7,16 @@
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_light</item>
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_light</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_light</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_light</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_light</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_light</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_light</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_light</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_light</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_light</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_light</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_light</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
@@ -82,9 +74,6 @@
         <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
         <item name="vctr_toolbar_link_text_color">@color/link_color_light</item>
 
-        <!-- default text colors -->
-        <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>
-
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
@@ -98,9 +87,6 @@
         <item name="riot_primary_text_color">@color/riot_primary_text_color_light</item>
         <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_light</item>
 
-        <!-- tab bar colors -->
-        <item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>
-
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">#FFF3F8FD</item>