From c26a341645031e83738a7c6bd9a8028b8c5708c8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 11 Jun 2021 12:40:15 +0200
Subject: [PATCH 01/49] Fix small regression on margin

---
 .../layout/view_attachment_type_selector.xml  | 265 +++++++++---------
 1 file changed, 135 insertions(+), 130 deletions(-)

diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index 4d54d2980a..648ca91820 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -1,162 +1,167 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="8dp"
-    android:layout_marginEnd="8dp"
-    android:background="@drawable/bg_attachment_type_selector"
-    android:orientation="vertical"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp">
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="16dp"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:weightSum="3">
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_attachment_type_selector"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        tools:ignore="UselessParent">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:layout_margin="16dp"
+            android:baselineAligned="false"
+            android:orientation="horizontal"
+            android:weightSum="3">
 
-            <ImageButton
-                android:id="@+id/attachmentCameraButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_camera"
-                android:src="@drawable/ic_attachment_camera_white_24dp"
-                tools:background="?colorPrimary" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_camera" />
+                <ImageButton
+                    android:id="@+id/attachmentCameraButton"
+                    style="@style/AttachmentTypeSelectorButton"
+                    android:contentDescription="@string/attachment_type_camera"
+                    android:src="@drawable/ic_attachment_camera_white_24dp"
+                    tools:background="?colorPrimary" />
+
+                <TextView
+                    style="@style/AttachmentTypeSelectorLabel"
+                    android:importantForAccessibility="no"
+                    android:text="@string/attachment_type_camera" />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageButton
+                    android:id="@+id/attachmentGalleryButton"
+                    style="@style/AttachmentTypeSelectorButton"
+                    android:contentDescription="@string/attachment_type_gallery"
+                    android:src="@drawable/ic_attachment_gallery_white_24dp"
+                    tools:background="?colorPrimary" />
+
+                <TextView
+                    style="@style/AttachmentTypeSelectorLabel"
+                    android:importantForAccessibility="no"
+                    android:text="@string/attachment_type_gallery" />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageButton
+                    android:id="@+id/attachmentFileButton"
+                    style="@style/AttachmentTypeSelectorButton"
+                    android:contentDescription="@string/attachment_type_file"
+                    android:src="@drawable/ic_attachment_file_white_24dp"
+                    tools:background="?colorPrimary" />
+
+                <TextView
+                    style="@style/AttachmentTypeSelectorLabel"
+                    android:importantForAccessibility="no"
+                    android:text="@string/attachment_type_file" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
-
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:layout_margin="16dp"
+            android:baselineAligned="false"
+            android:orientation="horizontal"
+            android:weightSum="3">
 
-            <ImageButton
-                android:id="@+id/attachmentGalleryButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_gallery"
-                android:src="@drawable/ic_attachment_gallery_white_24dp"
-                tools:background="?colorPrimary" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_gallery" />
+                <ImageButton
+                    android:id="@+id/attachmentAudioButton"
+                    style="@style/AttachmentTypeSelectorButton"
+                    android:contentDescription="@string/attachment_type_audio"
+                    android:src="@drawable/ic_attachment_audio_white_24dp"
+                    tools:background="?colorPrimary" />
 
-        </LinearLayout>
+                <TextView
+                    style="@style/AttachmentTypeSelectorLabel"
+                    android:importantForAccessibility="no"
+                    android:text="@string/attachment_type_audio" />
+
+            </LinearLayout>
 
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
-            <ImageButton
-                android:id="@+id/attachmentFileButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_file"
-                android:src="@drawable/ic_attachment_file_white_24dp"
-                tools:background="?colorPrimary" />
+                <ImageButton
+                    android:id="@+id/attachmentContactButton"
+                    style="@style/AttachmentTypeSelectorButton"
+                    android:contentDescription="@string/attachment_type_contact"
+                    android:src="@drawable/ic_attachment_contact_white_24dp"
+                    tools:background="?colorPrimary" />
 
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_file" />
+                <TextView
+                    style="@style/AttachmentTypeSelectorLabel"
+                    android:importantForAccessibility="no"
+                    android:text="@string/attachment_type_contact" />
 
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="16dp"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:weightSum="3">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/attachmentAudioButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_audio"
-                android:src="@drawable/ic_attachment_audio_white_24dp"
-                tools:background="?colorPrimary" />
-
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_audio" />
-
-        </LinearLayout>
+            </LinearLayout>
 
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
-            <ImageButton
-                android:id="@+id/attachmentContactButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_contact"
-                android:src="@drawable/ic_attachment_contact_white_24dp"
-                tools:background="?colorPrimary" />
+                <ImageButton
+                    android:id="@+id/attachmentStickersButton"
+                    style="@style/AttachmentTypeSelectorButton"
+                    android:contentDescription="@string/attachment_type_sticker"
+                    android:src="@drawable/ic_attachment_stickers_white_24dp"
+                    tools:background="?colorPrimary" />
 
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_contact" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/attachmentStickersButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_sticker"
-                android:src="@drawable/ic_attachment_stickers_white_24dp"
-                tools:background="?colorPrimary" />
-
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_sticker" />
+                <TextView
+                    style="@style/AttachmentTypeSelectorLabel"
+                    android:importantForAccessibility="no"
+                    android:text="@string/attachment_type_sticker" />
 
+            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-
-</LinearLayout>
+</FrameLayout>

From a2db0e4cceef0e6b6f4461acd9c5ccb93542bd8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jun 2021 07:33:43 +0000
Subject: [PATCH 02/49] Bump epoxy_version from 4.6.1 to 4.6.2

Bumps `epoxy_version` from 4.6.1 to 4.6.2.

Updates `epoxy` from 4.6.1 to 4.6.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2)

Updates `epoxy-glide-preloading` from 4.6.1 to 4.6.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2)

Updates `epoxy-processor` from 4.6.1 to 4.6.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2)

Updates `epoxy-paging` from 4.6.1 to 4.6.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.6.1...4.6.2)

---
updated-dependencies:
- dependency-name: com.airbnb.android:epoxy
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.airbnb.android:epoxy-glide-preloading
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.airbnb.android:epoxy-processor
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.airbnb.android:epoxy-paging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 427e2e18af..dcc91ce87d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -299,7 +299,7 @@ android {
 
 dependencies {
 
-    def epoxy_version = '4.6.1'
+    def epoxy_version = '4.6.2'
     def fragment_version = '1.3.4'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'

From f54246f71887cb48439334e5e24f38fff48d357a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 12:45:44 +0200
Subject: [PATCH 03/49] Update bg color on room list

---
 vector/src/main/res/layout/fragment_room_list.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index 9fe328ab6b..fac0c0f170 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -5,13 +5,14 @@
     android:id="@+id/stateView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface">
+    android:background="?android:colorBackground">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/roomListView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:overScrollMode="always"
+        tools:itemCount="5"
         tools:listitem="@layout/item_room" />
 
     <im.vector.app.features.home.room.list.widget.NotifsFabMenuView

From 2fb289ec1458102525a98f77d723de2a55b23bbf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 12:47:46 +0200
Subject: [PATCH 04/49] Cleanup

---
 vector/src/main/res/values/colors.xml      | 5 -----
 vector/src/main/res/values/theme_dark.xml  | 1 -
 vector/src/main/res/values/theme_light.xml | 1 -
 3 files changed, 7 deletions(-)

diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 1eae207f0a..60e63f7661 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -104,11 +104,6 @@
     <color name="vctr_room_active_widgets_banner_text_dark">#E3E8F0</color>
     <color name="vctr_room_active_widgets_banner_text_black">#E3E8F0</color>
 
-    <attr name="vctr_bottom_nav_icon_color" format="color" />
-    <color name="vctr_bottom_nav_icon_color_light">#C1C6CD</color>
-    <color name="vctr_bottom_nav_icon_color_dark">#8E99A4</color>
-    <color name="vctr_bottom_nav_icon_color_black">#8E99A4</color>
-
     <attr name="vctr_waiting_background_color" format="color" />
     <color name="vctr_waiting_background_color_light">#AAAAAAAA</color>
     <color name="vctr_waiting_background_color_dark">#55555555</color>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 0eb46baee0..50a6e99d9b 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -29,7 +29,6 @@
         <item name="vctr_room_active_widgets_banner_text">@color/vctr_room_active_widgets_banner_text_dark</item>
         <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_dark</item>
         <item name="vctr_reaction_background_on">@color/vctr_reaction_background_on_dark</item>
-        <item name="vctr_bottom_nav_icon_color">@color/vctr_bottom_nav_icon_color_dark</item>
         <item name="vctr_waiting_background_color">@color/vctr_waiting_background_color_dark</item>
         <item name="vctr_chat_effect_snow_background">@color/vctr_chat_effect_snow_background_dark</item>
         <item name="vctr_toolbar_background">@color/element_system_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index e976ca6e8d..256695f833 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -29,7 +29,6 @@
         <item name="vctr_room_active_widgets_banner_text">@color/vctr_room_active_widgets_banner_text_light</item>
         <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_light</item>
         <item name="vctr_reaction_background_on">@color/vctr_reaction_background_on_light</item>
-        <item name="vctr_bottom_nav_icon_color">@color/vctr_bottom_nav_icon_color_light</item>
         <item name="vctr_waiting_background_color">@color/vctr_waiting_background_color_light</item>
         <item name="vctr_chat_effect_snow_background">@color/vctr_chat_effect_snow_background_light</item>
         <item name="vctr_toolbar_background">@color/element_background_light</item>

From 1793885ec69c56c8e91058d89789a32443d5a78f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 20:20:19 +0200
Subject: [PATCH 05/49] TextAppearances: import from figma and apply to login
 screens

---
 .../layout/activity_debug_button_styles.xml   |   7 ++
 .../layout/activity_test_material_theme.xml   |  12 ++-
 .../res/layout/debug_text_appearance.xml      |  74 +++++++++++++
 .../main/res/layout/activity_signed_out.xml   |   6 +-
 vector/src/main/res/layout/fragment_login.xml |  12 ++-
 .../layout/fragment_login_account_created.xml |  15 ++-
 .../res/layout/fragment_login_captcha.xml     |   5 +-
 ...fragment_login_generic_text_input_form.xml |   9 +-
 ...agment_login_generic_text_input_form_2.xml |  12 ++-
 .../layout/fragment_login_reset_password.xml  |   6 +-
 .../fragment_login_reset_password_2.xml       |  12 ++-
 ...login_reset_password_mail_confirmation.xml |   9 +-
 ...gin_reset_password_mail_confirmation_2.xml |   9 +-
 .../fragment_login_reset_password_success.xml |   9 +-
 ...ragment_login_reset_password_success_2.xml |   9 +-
 .../fragment_login_server_selection.xml       |  19 ++--
 .../fragment_login_server_selection_2.xml     |  20 ++--
 .../layout/fragment_login_server_url_form.xml |  13 ++-
 .../fragment_login_server_url_form_2.xml      |   5 +-
 .../fragment_login_signin_password_2.xml      |   8 +-
 .../layout/fragment_login_signin_to_any_2.xml |   6 +-
 .../fragment_login_signin_username_2.xml      |   9 +-
 .../fragment_login_signup_password_2.xml      |  15 ++-
 ...fragment_login_signup_signin_selection.xml |   9 +-
 .../fragment_login_signup_username_2.xml      |  12 ++-
 .../main/res/layout/fragment_login_splash.xml |  12 ++-
 .../res/layout/fragment_login_splash_2.xml    |  12 ++-
 .../res/layout/fragment_login_sso_only_2.xml  |   3 +-
 .../main/res/layout/fragment_login_terms.xml  |   6 +-
 .../res/layout/fragment_login_terms_2.xml     |   6 +-
 .../layout/fragment_login_wait_for_email.xml  |   6 +-
 .../fragment_login_wait_for_email_2.xml       |   9 +-
 .../res/layout/fragment_reauth_confirm.xml    |   4 +-
 .../fragment_room_preview_no_preview.xml      |  10 +-
 .../src/main/res/layout/item_login_text.xml   |   3 +-
 .../src/main/res/layout/item_login_title.xml  |   3 +-
 .../res/layout/item_login_title_small.xml     |   3 +-
 vector/src/main/res/layout/item_policy.xml    |   6 +-
 .../main/res/layout/vector_invite_view.xml    |   9 +-
 .../layout/vector_preference_push_rule.xml    |   7 +-
 .../res/layout/view_room_widgets_banner.xml   |   2 +-
 vector/src/main/res/values/styles_buttons.xml |   4 -
 .../src/main/res/values/styles_text_view.xml  |   8 ++
 .../src/main/res/values/text_appearances.xml  | 102 ++++++++++--------
 vector/src/main/res/values/theme_dark.xml     |  11 ++
 vector/src/main/res/values/theme_light.xml    |  11 ++
 46 files changed, 395 insertions(+), 164 deletions(-)
 create mode 100644 vector/src/debug/res/layout/debug_text_appearance.xml
 create mode 100644 vector/src/main/res/values/styles_text_view.xml

diff --git a/vector/src/debug/res/layout/activity_debug_button_styles.xml b/vector/src/debug/res/layout/activity_debug_button_styles.xml
index 3973f7cbb6..b0baab6e38 100644
--- a/vector/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/vector/src/debug/res/layout/activity_debug_button_styles.xml
@@ -12,12 +12,19 @@
         android:orientation="vertical"
         android:padding="16dp">
 
+        <!-- Note: Default style is @style/VectorButtonStyle in the theme -->
         <Button
             style="@style/VectorButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Default" />
 
+        <Button
+            style="@style/VectorButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Line1\nLine 2" />
+
         <Button
             style="@style/VectorButtonStyle"
             android:layout_width="wrap_content"
diff --git a/vector/src/debug/res/layout/activity_test_material_theme.xml b/vector/src/debug/res/layout/activity_test_material_theme.xml
index 486c23478f..07b54ec0dd 100644
--- a/vector/src/debug/res/layout/activity_test_material_theme.xml
+++ b/vector/src/debug/res/layout/activity_test_material_theme.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".features.debug.DebugMaterialThemeActivity"
-    tools:ignore="HardcodedText">
+    tools:ignore="HardcodedText,MissingPrefix">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -441,6 +441,16 @@
 
                 </com.google.android.material.card.MaterialCardView>
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Text appearance" />
+
+                <include
+                    layout="@layout/debug_text_appearance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/vector/src/debug/res/layout/debug_text_appearance.xml b/vector/src/debug/res/layout/debug_text_appearance.xml
new file mode 100644
index 0000000000..39db326618
--- /dev/null
+++ b/vector/src/debug/res/layout/debug_text_appearance.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="HardcodedText">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceTitle"
+        android:textAppearance="@style/VectorTextAppearanceTitle" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceTitle.M"
+        android:textAppearance="@style/VectorTextAppearanceTitle.M" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceHeadlineM"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceSubtitle"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceSubtitle.M"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceBody\nVectorTextAppearanceBody"
+        android:textAppearance="@style/VectorTextAppearanceBody" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceBody.M"
+        android:textAppearance="@style/VectorTextAppearanceBody.M" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceButton"
+        android:textAppearance="@style/VectorTextAppearanceButton" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceCaption"
+        android:textAppearance="@style/VectorTextAppearanceCaption" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceMicro"
+        android:textAppearance="@style/VectorTextAppearanceMicro" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Default (VectorTextAppearanceBody)" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml
index 1e09430254..d3c291b23f 100644
--- a/vector/src/main/res/layout/activity_signed_out.xml
+++ b/vector/src/main/res/layout/activity_signed_out.xml
@@ -20,7 +20,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/signed_out_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -28,7 +29,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/signed_out_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/signedOutSubmit"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 555e9c7639..24714aca83 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -29,7 +29,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_signin_to" />
 
             <TextView
@@ -38,7 +39,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_matrix_org_text" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -103,7 +105,8 @@
                 android:layout_height="wrap_content"
                 android:gravity="start"
                 android:text="@string/login_signin_matrix_id_password_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -149,7 +152,8 @@
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 87af814769..349ecc9ec5 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -20,14 +20,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginAccountCreatedSubtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_account_created_subtitle" />
 
             <TextView
@@ -35,14 +37,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_account_created_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/loginAccountCreatedMessage"
@@ -108,7 +112,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_instruction"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <FrameLayout
                 android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index 4d7219b0d8..fed793cc8c 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -22,11 +22,12 @@
 
         <TextView
             android:id="@+id/loginCaptchaNotice"
-            style="@style/TextAppearance.Vector.Login.Text.Small"
+            style="@style/VectorTextAppearanceCaption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:text="@string/auth_recaptcha_message" />
+            android:text="@string/auth_recaptcha_message"
+            android:textColor="?vctr_content_secondary" />
 
         <!-- contentDescription does not work on WebView? -->
         <WebView
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index 4456ade772..67f7e1f9c6 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -19,7 +19,8 @@
                 android:id="@+id/loginGenericTextInputFormTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_set_email_title" />
 
             <TextView
@@ -29,7 +30,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:layout_marginBottom="26dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_set_email_notice" />
 
             <TextView
@@ -37,7 +39,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_msisdn_notice2"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
index e66995e96c..264f68685c 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
@@ -20,7 +20,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_set_email_title_2" />
 
             <TextView
@@ -30,7 +31,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:layout_marginBottom="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_set_email_notice_2" />
 
             <TextView
@@ -39,7 +41,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="26dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_email_mandatory_notice_2"
                 tools:visibility="visible" />
@@ -49,7 +52,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_msisdn_notice2"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index 147220990b..c9c2ba2d2d 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -18,7 +18,8 @@
                 android:id="@+id/resetPasswordTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
@@ -28,7 +29,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_reset_password_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/resetPasswordEmailTil"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
index 8ad180b6cd..03d27b1f2d 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
@@ -19,7 +19,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
@@ -28,7 +29,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_enter_your_email"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/resetPasswordEmailTil"
@@ -54,7 +56,8 @@
                 android:layout_marginTop="8dp"
                 android:gravity="start"
                 android:text="@string/login_reset_password_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -62,7 +65,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="16dp"
                 android:text="@string/login_choose_a_new_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <FrameLayout
                 android:id="@+id/passwordContainer"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
index cbddb32316..42b8258d99 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
@@ -17,14 +17,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
@@ -32,7 +34,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
index bae1f2f5e6..f7ee600faf 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
@@ -18,14 +18,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
@@ -33,7 +35,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success.xml b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
index bce973f9e5..28c11e774e 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
@@ -17,7 +17,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_success_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
@@ -25,14 +26,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
index 6ace2adc20..5a727de099 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
@@ -18,7 +18,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
@@ -26,14 +27,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 812607bc2c..7a5c9cc74f 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -23,7 +23,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
                 android:text="@string/login_server_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 android:transitionName="loginTitleTransition"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -36,7 +37,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_server_text"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
@@ -76,7 +78,8 @@
                     android:layout_marginTop="5dp"
                     android:gravity="start"
                     android:text="@string/login_server_matrix_org_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -118,7 +121,8 @@
                     android:layout_marginTop="7dp"
                     android:gravity="start"
                     android:text="@string/login_server_modular_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
                     app:layout_constraintStart_toStartOf="parent"
@@ -130,7 +134,7 @@
                     android:layout_height="wrap_content"
                     android:padding="16dp"
                     android:text="@string/login_server_modular_learn_more"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?colorPrimary"
                     app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -158,7 +162,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_server_other_title"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
@@ -173,7 +177,8 @@
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_server_other_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index c6f0106da6..3471bf2205 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -20,7 +20,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_server"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:ignore="UnknownId" />
 
             <TextView
@@ -30,7 +31,8 @@
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_server_text"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
             <im.vector.app.core.platform.CheckableConstraintLayout
@@ -64,7 +66,8 @@
                     android:layout_marginTop="5dp"
                     android:gravity="start"
                     android:text="@string/login_server_matrix_org_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -78,7 +81,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:text="@string/login_if_you_re_not_sure_select_this_option"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
             <im.vector.app.core.platform.CheckableConstraintLayout
@@ -98,7 +102,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_element_matrix_server_and_others"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
@@ -113,7 +117,8 @@
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_server_other_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -129,7 +134,8 @@
                 android:paddingTop="16dp"
                 android:paddingBottom="16dp"
                 android:text="@string/login_server_modular_learn_more_about_ems"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index fc5fc66285..045e20a1de 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -30,7 +30,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_connect_to_modular" />
 
             <TextView
@@ -39,7 +40,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_url_form_modular_text" />
 
             <TextView
@@ -48,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:text="@string/login_server_modular_learn_more"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?colorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -77,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:text="@string/login_clear_homeserver_history"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?colorPrimary"
                 android:visibility="invisible"
                 tools:visibility="visible" />
@@ -88,7 +90,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_url_form_common_notice" />
 
             <Button
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
index 1fad3da4b8..fe108fa4aa 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -21,7 +21,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_server_url_form_common_notice"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginServerUrlFormHomeServerUrlTil"
@@ -52,7 +53,7 @@
                 android:paddingEnd="0dp"
                 android:paddingBottom="16dp"
                 android:text="@string/login_clear_homeserver_history"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?colorPrimary"
                 android:visibility="invisible"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
index 42a6ca7c67..8862556fd3 100644
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
@@ -20,7 +20,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <ImageView
                 android:id="@+id/loginUserIcon"
@@ -36,7 +37,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="Welcome back user!" />
 
             <TextView
@@ -45,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_unknown_user_warning"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="@color/vector_warning_color_2"
                 android:visibility="gone"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
index bc7ea032fa..8d7ea34f8a 100644
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -20,7 +20,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_signin_to" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -123,7 +124,8 @@
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
index 2b39acb3d6..351fcafd8c 100644
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
@@ -21,7 +21,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_matrix_identifier"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginSubtitle"
@@ -29,7 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_matrix_identifier_help"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFieldTil"
@@ -64,7 +66,8 @@
                 android:layout_marginTop="32dp"
                 android:gravity="start"
                 android:text="@string/login_enter_identifier_help"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary" />
 
             <Button
                 android:id="@+id/loginChooseAServer"
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
index 4087426056..f41ac24b51 100644
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
@@ -20,21 +20,24 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_your_matrix_identifier"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginMatrixIdentifier"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="\@user:domain.org" />
 
             <TextView
@@ -42,7 +45,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/login_press_back_to_change"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
             <TextView
@@ -51,7 +55,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_choose_a_password"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary" />
 
             <FrameLayout
                 android:id="@+id/passwordContainer"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index 88b8dd37f3..c16fabc81c 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -36,7 +36,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
                 app:layout_goneMarginTop="0dp"
@@ -48,7 +49,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninTitle"
@@ -102,7 +104,8 @@
                     android:layout_marginTop="27dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
index ae2d3dc563..25ec1ea52a 100644
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -21,14 +21,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_user_name"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginSubtitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_signup_to" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -53,7 +55,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/login_please_choose_a_user_name_help_2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+                android:textAppearance="@style/VectorTextAppearanceCaption"
+                android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
             <Button
@@ -84,7 +87,8 @@
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 79312e1666..38144f0206 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -66,7 +66,8 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/login_splash_title"
-        android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+        android:textAppearance="@style/VectorTextAppearanceTitle"
+        android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
         app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
         app:layout_constraintEnd_toEndOf="parent"
@@ -109,7 +110,8 @@
             android:layout_marginStart="8dp"
             android:gravity="start"
             android:text="@string/login_splash_text1"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
@@ -133,7 +135,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text2"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/loginSplashText1"
@@ -157,7 +160,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text3"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
index 0829ae0520..9c6686b140 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -66,7 +66,8 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/login_splash_title"
-        android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+        android:textAppearance="@style/VectorTextAppearanceTitle"
+        android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
         app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace25"
         app:layout_constraintEnd_toEndOf="parent"
@@ -109,7 +110,8 @@
             android:layout_marginStart="8dp"
             android:gravity="start"
             android:text="@string/login_splash_text1"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
@@ -133,7 +135,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text2"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/loginSplashText1"
@@ -157,7 +160,8 @@
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text3"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            android:textAppearance="@style/VectorTextAppearanceBody"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
index ef6fc12e04..d41b834ed3 100644
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
@@ -18,7 +18,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary"
                 tools:ignore="UnknownId"
                 tools:text="@string/login_connect_to" />
 
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index bad4849df9..b295719e09 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -20,24 +20,26 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/TextAppearance.Vector.Login.Title"
+            style="@style/VectorTextAppearanceTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
             android:paddingStart="36dp"
             android:paddingEnd="36dp"
             android:text="@string/login_terms_title"
+            android:textColor="?vctr_content_primary"
             app:layout_constraintTop_toBottomOf="@id/loginLogo" />
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextAppearance.Vector.Login.Text.Small"
+            style="@style/VectorTextAppearanceBody"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:paddingStart="36dp"
             android:paddingEnd="36dp"
             android:text="@string/auth_accept_policies"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index 33b369f2f0..00c73d38ed 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -27,7 +27,8 @@
             android:layout_marginTop="52dp"
             android:layout_marginEnd="36dp"
             android:text="@string/login_terms_title"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+            android:textAppearance="@style/VectorTextAppearanceTitle"
+            android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/loginLogo"
@@ -35,13 +36,14 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextAppearance.Vector.Login.Text.Small"
+            style="@style/VectorTextAppearanceBody"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:paddingStart="36dp"
             android:paddingEnd="36dp"
             android:text="@string/auth_accept_policies"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email.xml b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
index 9b5132f537..ae1be34abc 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
@@ -19,7 +19,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_wait_for_email_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
@@ -27,7 +28,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_wait_for_email_notice" />
 
             <ProgressBar
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index accb43e244..bb209d0175 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -19,7 +19,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_wait_for_email_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
+                android:textAppearance="@style/VectorTextAppearanceTitle"
+                android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
@@ -27,7 +28,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                android:textColor="?vctr_content_primary"
                 tools:text="@string/login_wait_for_email_notice_2" />
 
             <TextView
@@ -37,7 +39,8 @@
                 android:layout_marginTop="32dp"
                 android:gravity="start"
                 android:text="@string/login_wait_for_email_help"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
+                android:textAppearance="@style/VectorTextAppearanceBody"
+                android:textColor="?vctr_content_secondary" />
 
             <ProgressBar
                 style="@style/VectorHorizontalProgressBar"
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index 9390edf7a2..a5d40c4f0c 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -70,7 +70,7 @@
         <!--            android:layout_height="wrap_content"-->
         <!--            android:gravity="start"-->
         <!--            android:text="@string/login_signin_matrix_id_password_notice"-->
-        <!--            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"-->
+        <!--            android:textAppearance="@style/VectorTextAppearanceCaption"-->
         <!--            android:visibility="gone"-->
         <!--            app:layout_constraintEnd_toEndOf="parent"-->
         <!--            app:layout_constraintStart_toStartOf="parent"-->
@@ -83,7 +83,7 @@
             android:layout_height="wrap_content"
             android:gravity="start"
             android:text="@string/authentication_error"
-            android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?colorError"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 8983498451..8b872778e2 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -94,7 +94,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="56dp"
                     android:gravity="center"
-                    android:textAppearance="@style/TextAppearance.Vector.Title"
+                    android:textAppearance="@style/VectorTextAppearanceTitle"
+                    android:textColor="?vctr_content_primary"
                     android:textSize="15sp"
                     android:textStyle="bold"
                     tools:text="@sample/rooms.json/data/name" />
@@ -106,8 +107,8 @@
                     android:layout_marginTop="@dimen/layout_vertical_margin"
                     android:autoLink="web"
                     android:gravity="center"
-                    android:textAppearance="@style/TextAppearance.Vector.Subtitle"
-                    android:textSize="15sp"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                    android:textColor="?vctr_content_secondary"
                     tools:text="@sample/rooms.json/data/topic" />
 
                 <TextView
@@ -116,7 +117,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
                     android:gravity="center"
-                    android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                    android:textColor="?vctr_content_secondary"
                     android:textSize="14sp"
                     tools:text="@string/room_preview_no_preview" />
 
diff --git a/vector/src/main/res/layout/item_login_text.xml b/vector/src/main/res/layout/item_login_text.xml
index 436d6465c1..65c6024335 100644
--- a/vector/src/main/res/layout/item_login_text.xml
+++ b/vector/src/main/res/layout/item_login_text.xml
@@ -8,5 +8,6 @@
     android:layout_marginTop="12dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+    android:textColor="?vctr_content_secondary"
+    android:textAppearance="@style/VectorTextAppearanceBody"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index 81b9570e7e..d09c4f36b4 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_title.xml
@@ -8,5 +8,6 @@
     android:layout_marginTop="32dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+    android:textAppearance="@style/VectorTextAppearanceTitle"
+    android:textColor="?vctr_content_primary"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index 16a77ce9cd..a0252d96ee 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.xml
@@ -8,5 +8,6 @@
     android:layout_marginTop="16dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
+    android:textAppearance="@style/VectorTextAppearanceSubtitle"
+    android:textColor="?vctr_content_primary"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index 12ec6c91aa..52baf61315 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -19,10 +19,11 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_title"
-        style="@style/TextAppearance.Vector.Login.Text"
+        style="@style/VectorTextAppearanceBody"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
+        android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@+id/adapter_item_policy_subtitle"
         app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
         app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"
@@ -32,11 +33,12 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_subtitle"
-        style="@style/TextAppearance.Vector.Login.Text.Small"
+        style="@style/VectorTextAppearanceCaption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:drawablePadding="8dp"
+        android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
         app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 7af3262248..78a8e6359e 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -26,7 +26,8 @@
         android:layout_marginTop="40dp"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/TextAppearance.Vector.Title"
+        android:textAppearance="@style/VectorTextAppearanceTitle"
+        android:textColor="?vctr_content_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteAvatarView"
@@ -39,7 +40,8 @@
         android:layout_marginTop="8dp"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/TextAppearance.Vector.Subtitle"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteNameView"
@@ -51,7 +53,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
         android:text="@string/send_you_invite"
-        android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteIdentifierView" />
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index 9df48bbe5d..1028b3210c 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -23,8 +23,8 @@
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:textSize="16sp"
+            android:textAppearance="?textAppearanceListItem"
+            android:textColor="?vctr_content_primary"
             tools:text="Title" />
 
         <TextView
@@ -35,9 +35,8 @@
             android:layout_alignStart="@android:id/title"
             android:maxLines="2"
             android:paddingTop="6dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?textAppearanceListItemSecondary"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             tools:text="Summary"
             tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/view_room_widgets_banner.xml b/vector/src/main/res/layout/view_room_widgets_banner.xml
index 6575078626..c0f6c2efd4 100644
--- a/vector/src/main/res/layout/view_room_widgets_banner.xml
+++ b/vector/src/main/res/layout/view_room_widgets_banner.xml
@@ -17,7 +17,7 @@
         android:paddingTop="8dp"
         android:paddingEnd="12dp"
         android:paddingBottom="8dp"
-        android:textAppearance="@style/TextAppearance.Vector.Title"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_room_active_widgets_banner_text"
         tools:text="2 active widgets" />
 
diff --git a/vector/src/main/res/values/styles_buttons.xml b/vector/src/main/res/values/styles_buttons.xml
index 71f23d71da..9f0b1aace0 100644
--- a/vector/src/main/res/values/styles_buttons.xml
+++ b/vector/src/main/res/values/styles_buttons.xml
@@ -5,8 +5,6 @@
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">14sp</item>
     </style>
 
     <style name="VectorButtonStyle.Destructive">
@@ -31,8 +29,6 @@
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">14sp</item>
     </style>
 
     <style name="VectorButtonStyleUnelevated.Bot">
diff --git a/vector/src/main/res/values/styles_text_view.xml b/vector/src/main/res/values/styles_text_view.xml
new file mode 100644
index 0000000000..2efd1cee08
--- /dev/null
+++ b/vector/src/main/res/values/styles_text_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorTextView" parent="Widget.MaterialComponents.TextView">
+
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/text_appearances.xml b/vector/src/main/res/values/text_appearances.xml
index 750dcaf10e..d65bcdc6d0 100644
--- a/vector/src/main/res/values/text_appearances.xml
+++ b/vector/src/main/res/values/text_appearances.xml
@@ -1,63 +1,79 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="TextAppearance.Vector.Title" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
+    <style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">32sp</item>
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
+    <style name="VectorTextAppearanceTitle.M">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="TextAppearance.Vector.Subtitle2" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">14sp</item>
+    <style name="VectorTextAppearanceHeadlineM" parent="TextAppearance.MaterialComponents.Headline1">
+        <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Login.Title" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">20sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:letterSpacing">0</item>
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Login.Title.Small">
-        <item name="android:textSize">15sp</item>
-    </style>
-
-    <style name="TextAppearance.Vector.Login.Text" parent="TextAppearance.AppCompat">
-        <item name="android:textSize">16sp</item>
+    <style name="VectorTextAppearanceSubtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0</item>
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Login.Text.Small">
+    <style name="VectorTextAppearanceSubtitle.M">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <!-- Note: this is the default text appearance for all the TextViews -->
+    <style name="VectorTextAppearanceBody" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">20sp</item>
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
+    <style name="VectorTextAppearanceBody.M">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <style name="VectorTextAppearanceCaption" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">12sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">16sp</item>
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
+    <style name="VectorTextAppearanceMicro" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">10sp</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="lineHeight">16sp</item>
+    </style>
+
+    <style name="VectorTextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
+        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.02</item>
+        <item name="lineHeight">24sp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 50a6e99d9b..bf03ab878d 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -63,7 +63,18 @@
         <item name="android:colorBackground">@color/element_background_dark</item>
         <item name="colorOnBackground">?vctr_content_primary</item>
 
+        <!--Material type attributes-->
+        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
+        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <!-- Default Text appearance for TextViews -->
+        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <!-- Text appearance for List item (TODO Check that this is used in Preference Screen -->
+        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+
         <!-- Default styles -->
+        <item name="android:textViewStyle">@style/VectorTextView</item>
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 256695f833..758b120c5f 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -63,7 +63,18 @@
         <item name="android:colorBackground">@color/element_background_light</item>
         <item name="colorOnBackground">?vctr_content_primary</item>
 
+        <!--Material type attributes-->
+        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
+        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <!-- Default Text appearance for TextViews -->
+        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <!-- Text appearance for List item -->
+        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+
         <!-- Default styles -->
+        <item name="android:textViewStyle">@style/VectorTextView</item>
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>

From 070dae78e718885a0a8b9e85dd7b867418c6dafb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 21:22:56 +0200
Subject: [PATCH 06/49] textSize 12sp -> Caption or Default

---
 .../main/res/layout/item_video_attachment.xml   | 13 ++++++-------
 vector/src/debug/res/layout/item_sas_emoji.xml  |  2 +-
 .../src/main/res/layout/activity_bug_report.xml |  4 ++--
 .../main/res/layout/dialog_device_verify.xml    | 14 ++++----------
 .../main/res/layout/dialog_prompt_password.xml  |  3 +--
 .../fragment_bootstrap_enter_passphrase.xml     |  3 ++-
 .../res/layout/fragment_devtools_editor.xml     |  1 -
 .../layout/fragment_login_account_created.xml   |  2 +-
 .../res/layout/item_autocomplete_command.xml    |  6 +++---
 .../main/res/layout/item_autocomplete_emoji.xml |  4 ++--
 .../layout/item_autocomplete_matrix_item.xml    |  4 ++--
 .../layout/item_autocomplete_more_result.xml    |  4 ++--
 .../item_bottom_sheet_message_preview.xml       |  4 ++--
 vector/src/main/res/layout/item_device.xml      | 17 +++++++----------
 .../src/main/res/layout/item_profile_action.xml |  2 +-
 .../res/layout/item_profile_matrix_item.xml     |  7 ++++---
 .../item_profile_matrix_item_progress.xml       |  4 ++--
 .../res/layout/item_room_to_manage_in_space.xml |  6 +++---
 .../src/main/res/layout/item_search_result.xml  |  2 +-
 .../res/layout/item_settings_information.xml    |  2 +-
 .../res/layout/item_timeline_event_base.xml     |  2 +-
 .../item_timeline_event_call_tile_stub.xml      |  2 +-
 .../item_timeline_event_merged_utd_stub.xml     |  6 +++---
 .../layout/item_timeline_event_poll_stub.xml    |  2 +-
 .../item_timeline_event_status_tile_stub.xml    |  2 +-
 .../item_timeline_event_verification_stub.xml   |  2 +-
 .../res/layout/item_verification_action.xml     |  4 ++--
 .../main/res/layout/item_verification_wait.xml  |  2 +-
 .../media_upload_download_progress_layout.xml   |  3 ++-
 .../layout/view_bottom_sheet_action_button.xml  |  4 ++--
 vector/src/main/res/layout/view_read_marker.xml |  3 ++-
 .../src/main/res/layout/view_read_receipts.xml  |  3 ++-
 .../main/res/layout/view_space_type_button.xml  |  4 ++--
 .../view_stub_room_member_profile_header.xml    |  3 ++-
 34 files changed, 70 insertions(+), 76 deletions(-)

diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
index 29f01650fd..c693ee37c5 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/videoThumbnailImage"
@@ -19,19 +19,18 @@
 
     <ImageView
         android:id="@+id/videoControlIcon"
-        android:layout_centerInParent="true"
-        android:visibility="gone"
-        tools:visibility="visible"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        />
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <ProgressBar
-        android:layout_centerInParent="true"
         android:id="@+id/videoLoaderProgress"
         style="?android:attr/progressBarStyle"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_centerInParent="true"
         android:visibility="invisible"
         tools:visibility="visible" />
 
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index 23d6f3b348..97f723b323 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -46,7 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:textSize="12sp"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             tools:text="verification_emoji_spanner" />
 
     </LinearLayout>
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 9c52cd6851..4736ec667e 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -96,8 +96,8 @@
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     android:text="@string/send_bug_report_description_in_english"
-                    android:textColor="?vctr_content_secondary"
-                    android:textSize="12sp" />
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
+                    android:textColor="?vctr_content_secondary" />
 
                 <TextView
                     android:id="@+id/bug_report_logs_description"
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index 75255c05d8..99612212e0 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -16,22 +16,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
-            android:text="@string/encryption_information_verify_device_warning"
-            android:textSize="12sp" />
+            android:text="@string/encryption_information_verify_device_warning" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/encryption_information_device_name"
-            android:textSize="12sp"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/encrypted_device_info_device_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="12sp"
             tools:text="a device name" />
 
         <TextView
@@ -39,14 +36,12 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/encryption_information_device_id"
-            android:textSize="12sp"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/encrypted_device_info_device_id"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="12sp"
             tools:text="a device id" />
 
         <TextView
@@ -54,21 +49,20 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/encryption_information_device_key"
-            android:textSize="12sp"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/encrypted_device_info_device_key"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="12sp"
             tools:text="a device key" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
-            android:text="@string/encryption_information_verify_device_warning2"
-            android:textSize="12sp" />
+            android:text="@string/encryption_information_verify_device_warning2" />
+
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index e0e63eebd4..6938b318dd 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -17,8 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
-            android:text="@string/devices_delete_dialog_text"
-            android:textSize="12sp" />
+            android:text="@string/devices_delete_dialog_text" />
 
         <FrameLayout
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 447286f0a4..05cb3faa6d 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -55,7 +55,8 @@
             android:drawablePadding="4dp"
             android:gravity="center_vertical"
             android:text="@string/bootstrap_dont_reuse_pwd"
-            android:textSize="12sp"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
+            android:textColor="?vctr_content_primary"
             app:drawableStartCompat="@drawable/ic_alert_triangle"
             app:drawableTint="?colorError" />
 
diff --git a/vector/src/main/res/layout/fragment_devtools_editor.xml b/vector/src/main/res/layout/fragment_devtools_editor.xml
index fd657555bc..b3fe9834d7 100644
--- a/vector/src/main/res/layout/fragment_devtools_editor.xml
+++ b/vector/src/main/res/layout/fragment_devtools_editor.xml
@@ -13,7 +13,6 @@
         android:hint="@string/dev_tools_event_content_hint"
         android:inputType="textMultiLine"
         android:scrollHorizontally="true"
-        android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 349ecc9ec5..b6e7f4beb4 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -89,8 +89,8 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
+                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary"
-                    android:textSize="12sp"
                     app:layout_constraintBaseline_toBaselineOf="@+id/loginAccountCreatedMemberName"
                     app:layout_constraintEnd_toEndOf="parent"
                     tools:text="@tools:sample/date/hhmm" />
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index 70179ac8b9..53121fa1e3 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -16,8 +16,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
-        android:textSize="12sp"
         android:textStyle="bold"
         tools:text="/invite" />
 
@@ -29,8 +29,8 @@
         android:layout_marginStart="5dp"
         android:layout_toEndOf="@+id/commandName"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         android:textStyle="italic"
         tools:text="&lt;user-id&gt;" />
 
@@ -42,8 +42,8 @@
         android:layout_alignParentStart="true"
         android:layout_gravity="center_vertical"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         tools:text="@string/command_description_invite_user" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index f4c2bbf0bc..feea2ccd2c 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -31,8 +31,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:maxLines="1"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_primary"
-            android:textSize="12sp"
             android:textStyle="bold"
             tools:text="name" />
 
@@ -44,8 +44,8 @@
             android:layout_marginTop="2dp"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary"
-            android:textSize="12sp"
             android:visibility="gone"
             tools:text="name"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 9203cac6bf..0e3839e140 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -29,8 +29,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:maxLines="1"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_primary"
-            android:textSize="12sp"
             android:textStyle="bold"
             tools:text="name" />
 
@@ -41,8 +41,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginTop="2dp"
             android:maxLines="1"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary"
-            android:textSize="12sp"
             android:visibility="gone"
             tools:text="name"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_autocomplete_more_result.xml b/vector/src/main/res/layout/item_autocomplete_more_result.xml
index 315af94be2..53806af7b0 100644
--- a/vector/src/main/res/layout/item_autocomplete_more_result.xml
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -5,5 +5,5 @@
     android:background="?android:colorBackground"
     android:padding="8dp"
     android:text="@string/autocomplete_limited_results"
-    android:textColor="?vctr_content_secondary"
-    android:textSize="12sp" />
+    android:textAppearance="@style/VectorTextAppearanceCaption"
+    android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 1098cb7ecd..61b53f9c13 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -45,8 +45,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/bottom_sheet_message_preview_sender"
         app:layout_constraintEnd_toEndOf="parent"
         tools:text="Friday 8pm" />
@@ -91,9 +91,9 @@
         android:layout_marginBottom="4dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_tertiary"
         android:textIsSelectable="false"
-        android:textSize="12sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/bottom_sheet_message_preview_body"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 8ca64665a2..43b026dd60 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -22,8 +22,8 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:minHeight="40dp"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             tools:text="Riot X" />
 
         <!---
@@ -35,15 +35,14 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/devices_details_name_title"
-            android:textColor="?vctr_content_secondary"
-            android:textSize="12sp" />
+            android:textAppearance="@style/VectorTextAppearanceCaption"
+            android:textColor="?vctr_content_secondary" />
 
         <TextView
             android:id="@+id/itemDeviceDisplayName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             tools:text="Android phone" />
 
         <TextView
@@ -52,8 +51,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/devices_details_id_title"
-            android:textColor="?vctr_content_secondary"
-            android:textSize="12sp" />
+            android:textAppearance="@style/VectorTextAppearanceCaption"
+            android:textColor="?vctr_content_secondary" />
 
         <TextView
             android:id="@+id/itemDeviceId"
@@ -62,7 +61,6 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             tools:text="XUIDERFZAA" />
 
         <TextView
@@ -71,15 +69,14 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/devices_details_last_seen_title"
-            android:textColor="?vctr_content_secondary"
-            android:textSize="12sp" />
+            android:textAppearance="@style/VectorTextAppearanceCaption"
+            android:textColor="?vctr_content_secondary" />
 
         <TextView
             android:id="@+id/itemDeviceLastSeen"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             tools:text="x.x.x.x @ 01/01 00:00:00" />
 
     </LinearLayout>
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index d325ce7efe..52f511d0f9 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -56,8 +56,8 @@
         android:layout_marginEnd="16dp"
         android:drawablePadding="16dp"
         android:ellipsize="end"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/actionSecondaryAccessory"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 3b81fb0717..df12a7f841 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -43,8 +43,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
@@ -61,8 +61,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
@@ -76,7 +76,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:textSize="12sp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
+        android:textColor="?vctr_content_primary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/matrixItemEditable"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 4fa7dc326f..ddc477f4ef 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -43,8 +43,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
@@ -61,8 +61,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index 837e81a239..d887b727c8 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -48,14 +48,14 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:text="@string/space_suggested"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
         app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        android:text="@string/space_suggested" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <ImageView
         android:id="@+id/itemAddRoomRoomCheckBox"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index ad8f293d4c..dccce2b462 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -42,8 +42,8 @@
         android:layout_alignBaseline="@+id/messageMemberNameView"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/messageMemberNameView"
         app:layout_constraintEnd_toEndOf="parent"
         tools:text="@tools:sample/date/hhmm" />
diff --git a/vector/src/main/res/layout/item_settings_information.xml b/vector/src/main/res/layout/item_settings_information.xml
index ae3e6aa804..0b9e0ebcdf 100644
--- a/vector/src/main/res/layout/item_settings_information.xml
+++ b/vector/src/main/res/layout/item_settings_information.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
-        android:textSize="12sp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index e4d7aa7d9f..6be8bc0ede 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -49,8 +49,8 @@
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         tools:text="@tools:sample/date/hhmm" />
 
     <View
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index ab59802145..db2884741f 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -39,8 +39,8 @@
         android:layout_marginBottom="12dp"
         android:drawablePadding="4dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
-        android:textSize="12sp"
         tools:text="@string/action_video_call" />
 
     <TextView
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 9a26855396..037939e396 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -30,8 +30,8 @@
             android:text="@string/notice_crypto_unable_to_decrypt_merged"
             android:textColor="?vctr_content_secondary"
             android:textSize="15sp"
-            app:drawableTint="?vctr_content_secondary"
-            app:drawableStartCompat="@drawable/ic_clock" />
+            app:drawableStartCompat="@drawable/ic_clock"
+            app:drawableTint="?vctr_content_secondary" />
 
 
         <TextView
@@ -44,8 +44,8 @@
             android:layout_marginBottom="12dp"
             android:gravity="center"
             android:text="@string/notice_crypto_unable_to_decrypt_friendly_desc"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary"
-            android:textSize="12sp"
             android:textStyle="italic" />
 
 
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index 23833d91c9..69b91270b5 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -137,8 +137,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         android:visibility="gone"
         tools:text="12 votes - Final Results"
         tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index ff0effcb5f..9b2927adb1 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -29,8 +29,8 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="12dp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
-        android:textSize="12sp"
         tools:text="Alice (@alice:matrix.org)" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 0b38afd0f5..c95bb5ff84 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -30,8 +30,8 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="12dp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
-        android:textSize="12sp"
         tools:text="Alice (@alice:matrix.org)" />
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 69c513985f..adefde99ea 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -36,8 +36,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?colorPrimary"
-        android:textSize="16sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/itemVerificationActionSubTitle"
         app:layout_constraintEnd_toStartOf="@+id/itemVerificationActionIcon"
@@ -52,8 +52,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         android:visibility="gone"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index 278a8a8fd0..6a612a5f67 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -89,8 +89,8 @@
         android:layout_marginTop="16dp"
         android:gravity="center"
         android:text="@string/or_other_mx_capabale_client"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/labelsBarrier" />
diff --git a/vector/src/main/res/layout/media_upload_download_progress_layout.xml b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
index a110e08135..f581bbf7de 100644
--- a/vector/src/main/res/layout/media_upload_download_progress_layout.xml
+++ b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
@@ -11,7 +11,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:textSize="12sp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
+        android:textColor="?vctr_content_primary"
         tools:text="Information" />
 
     <ProgressBar
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index 8a950f17ea..3fbb180e11 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -41,8 +41,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?colorPrimary"
-            android:textSize="16sp"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@+id/bottomSheetActionSubTitle"
             app:layout_constraintEnd_toStartOf="@+id/bottomSheetActionIcon"
@@ -57,8 +57,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="12sp"
             android:visibility="gone"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index bea00fbb15..d05a96f63c 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -11,7 +11,8 @@
         android:layout_height="match_parent"
         android:layout_marginEnd="8dp"
         android:gravity="center"
-        android:textSize="12sp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
+        android:textColor="?vctr_content_primary"
         tools:text="999+" />
 
     <ImageView
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index 6e674406fa..bd6ec9c832 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -15,7 +15,8 @@
         android:importantForAccessibility="no"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:textSize="12sp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
+        android:textColor="?vctr_content_primary"
         tools:text="999+" />
 
     <ImageView
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index 67b23f9a94..d5f8580aff 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -28,8 +28,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
         android:gravity="start"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/subTitle"
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
@@ -45,8 +45,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
         android:gravity="start"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="12sp"
         android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index dcdf9e4bcc..1d38fef08a 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -75,7 +75,8 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:gravity="center"
-            android:textSize="12sp"
+            android:textAppearance="@style/VectorTextAppearanceCaption"
+            android:textColor="?vctr_content_primary"
             app:layout_constraintBottom_toTopOf="@+id/memberProfileStatusView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

From dbdf9b05fa2cb6ea5c51080b3f1024fc553a17fe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 21:29:12 +0200
Subject: [PATCH 07/49] textSize 16sp ->
 android:textAppearance="@style/VectorTextAppearanceSubtitle"

---
 vector/src/debug/res/layout/item_sas_emoji.xml              | 6 ++++--
 .../res/layout/bottom_sheet_generic_list_with_title.xml     | 2 +-
 .../main/res/layout/bottom_sheet_room_widget_permission.xml | 6 +++---
 vector/src/main/res/layout/bottom_sheet_space_invite.xml    | 4 ++--
 .../main/res/layout/bottom_sheet_space_invite_chooser.xml   | 2 +-
 vector/src/main/res/layout/dialog_disclaimer_content.xml    | 2 +-
 vector/src/main/res/layout/dialog_export_e2e_keys.xml       | 2 +-
 vector/src/main/res/layout/dialog_import_e2e_keys.xml       | 2 +-
 .../src/main/res/layout/dialog_recovery_key_saved_info.xml  | 2 +-
 .../res/layout/fragment_keys_backup_restore_from_key.xml    | 2 +-
 .../layout/fragment_keys_backup_restore_from_passphrase.xml | 2 +-
 .../res/layout/fragment_keys_backup_restore_success.xml     | 2 +-
 .../src/main/res/layout/fragment_login_server_selection.xml | 3 +--
 .../main/res/layout/fragment_login_server_selection_2.xml   | 3 +--
 vector/src/main/res/layout/fragment_reauth_confirm.xml      | 2 +-
 .../main/res/layout/fragment_recyclerview_with_search.xml   | 2 +-
 vector/src/main/res/layout/fragment_set_identity_server.xml | 4 ++--
 vector/src/main/res/layout/fragment_space_add_rooms.xml     | 2 +-
 .../main/res/layout/fragment_space_create_choose_type.xml   | 2 +-
 .../src/main/res/layout/fragment_ssss_access_from_key.xml   | 2 +-
 .../res/layout/fragment_ssss_access_from_passphrase.xml     | 2 +-
 vector/src/main/res/layout/fragment_user_list.xml           | 1 -
 vector/src/main/res/layout/item_emoji_result.xml            | 3 +--
 vector/src/main/res/layout/item_generic_with_value.xml      | 2 +-
 vector/src/main/res/layout/item_loading.xml                 | 4 ++--
 vector/src/main/res/layout/item_locale.xml                  | 3 +--
 vector/src/main/res/layout/item_profile_action.xml          | 2 +-
 vector/src/main/res/layout/item_room_directory_server.xml   | 2 +-
 vector/src/main/res/layout/item_settings_three_pid.xml      | 2 +-
 vector/src/main/res/layout/item_uploads_file.xml            | 2 +-
 vector/src/main/res/layout/item_verification_waiting.xml    | 2 +-
 vector/src/main/res/layout/view_state.xml                   | 2 +-
 32 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index 97f723b323..be68af6021 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -16,7 +16,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:gravity="center"
-        android:textSize="16sp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="?vctr_content_primary"
         tools:text="63:" />
 
     <TextView
@@ -38,7 +39,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:textSize="16sp"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
+            android:textColor="?vctr_content_primary"
             tools:text="@string/verification_emoji_spanner" />
 
         <TextView
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
index cb211865b4..6529117c51 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
@@ -13,8 +13,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:padding="8dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         tools:text="@string/reactions" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index ab61f10f5f..cf29601038 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -29,8 +29,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:text="@string/room_widget_permission_added_by"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="16sp" />
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="?vctr_content_secondary" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -84,8 +84,8 @@
         android:layout_marginTop="@dimen/layout_vertical_margin_big"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
-        android:textSize="16sp"
         tools:text="@string/room_widget_permission_shared_info_title" />
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index 10120747cf..5344841f71 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -16,8 +16,8 @@
         android:layout_marginBottom="12dp"
         android:gravity="center"
         android:text="@string/invite_people_to_your_space"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -27,8 +27,8 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
-        android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
         app:layout_constraintTop_toBottomOf="@id/headerText"
         app:layout_constraintVertical_bias="1"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 5c504bd7c0..a86adca3c7 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -15,8 +15,8 @@
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:text="@string/invite_people_menu"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index 7b12194604..33d1e493cd 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -60,8 +60,8 @@
         android:gravity="center"
         android:paddingBottom="32dp"
         android:text="@string/disclaimer_content"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
-        android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/disclaimerTextView" />
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 7a2dafd08e..8b9454c7c9 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -15,8 +15,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/encryption_export_notice"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         app:layout_constraintTop_toTopOf="parent" />
 
     <im.vector.app.core.ui.views.RevealPasswordImageView
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 3fb9f1bc2c..cf202b00f8 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -16,8 +16,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 85feaf6587..e45e44d769 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -50,8 +50,8 @@
             android:id="@+id/keepItSafeText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_secondary"
-            android:textSize="16sp"
             tools:text="@string/bootstrap_crosssigning_save_usb" />
 
     </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index 93489d31b9..eb4385e275 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -31,8 +31,8 @@
             android:layout_margin="16dp"
             android:text="@string/keys_backup_restore_with_recovery_key"
             android:textAlignment="center"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index 338874a537..a0be7cfa23 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -31,8 +31,8 @@
             android:layout_margin="16dp"
             android:text="@string/keys_backup_restore_with_passphrase"
             android:textAlignment="center"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index fc917f1247..cd375f3d8f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -39,8 +39,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:textAlignment="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
-        android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/success_text"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 7a5c9cc74f..2d2a996f71 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -162,9 +162,8 @@
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_server_other_title"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index 3471bf2205..e1f660834f 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -102,9 +102,8 @@
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_element_matrix_server_and_others"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index a5d40c4f0c..54f55bc6f4 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -17,8 +17,8 @@
             android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
             android:text="@string/re_authentication_default_confirm_text"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             app:layout_constraintBottom_toTopOf="@id/reAuthConfirmButton"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index f065a5a8b0..efdbdfea1f 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -56,8 +56,8 @@
                     android:ellipsize="end"
                     android:gravity="start|center"
                     android:maxLines="1"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_secondary"
-                    android:textSize="16sp"
                     tools:text="@tools:sample/lorem/random" />
 
             </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_set_identity_server.xml b/vector/src/main/res/layout/fragment_set_identity_server.xml
index 4c3567fedc..19c52873e2 100644
--- a/vector/src/main/res/layout/fragment_set_identity_server.xml
+++ b/vector/src/main/res/layout/fragment_set_identity_server.xml
@@ -16,8 +16,8 @@
             android:id="@+id/identityServerSetDefaultNotice"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             android:visibility="gone"
             tools:text="@string/identity_server_set_default_notice"
             tools:visibility="visible" />
@@ -39,8 +39,8 @@
             android:id="@+id/identityServerSetDefaultAlternative"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             tools:text="@string/identity_server_set_alternative_notice" />
 
         <com.google.android.material.textfield.TextInputLayout
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 3dd57f6101..786bda0c95 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -54,8 +54,8 @@
                     android:ellipsize="end"
                     android:gravity="start|center"
                     android:maxLines="1"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_secondary"
-                    android:textSize="16sp"
                     tools:text="@sample/spaces.json/data/name" />
 
             </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 0aab5b34e6..7213e91f9f 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -16,8 +16,8 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/create_spaces_type_header"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_secondary"
-            android:textSize="16sp"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index 31550f5bc7..7e37a9a4fb 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -44,8 +44,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ssss_restore_with_key"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index e334576659..8409aa087e 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -44,8 +44,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ssss_restore_with_passphrase"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 8a211b9a7b..135ff11714 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -93,7 +93,6 @@
         android:maxHeight="80dp"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
-        android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/chipGroupScrollView" />
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index d74b254e67..5fe7544e3b 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -32,8 +32,8 @@
             android:id="@+id/item_emoji_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             android:textStyle="bold"
             tools:text="Smiley Face" />
 
@@ -43,7 +43,6 @@
             android:layout_height="wrap_content"
             android:maxLines="2"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             android:visibility="gone"
             tools:text="Smile, foo, bar"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index 3612be30db..ddeb03c21b 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -24,8 +24,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="0dp"
         android:layout_weight="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         tools:text="Label" />
 
 
diff --git a/vector/src/main/res/layout/item_loading.xml b/vector/src/main/res/layout/item_loading.xml
index c5fddae4a8..0ad64d6b1d 100644
--- a/vector/src/main/res/layout/item_loading.xml
+++ b/vector/src/main/res/layout/item_loading.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="1dp"
     android:background="?android:colorBackground"
+    android:minHeight="1dp"
     android:orientation="vertical">
 
     <TextView
@@ -14,8 +14,8 @@
         android:layout_gravity="center"
         android:layout_margin="@dimen/layout_vertical_margin"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         tools:text="Waiting message" />
 
     <ProgressBar
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index e20e77f2b4..bfa504aa1b 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -13,8 +13,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@+id/localeSubtitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -29,7 +29,6 @@
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 52f511d0f9..54f7381182 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -37,8 +37,8 @@
         android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/actionSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/actionEditable"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index 83fc66bdd2..a6a52e0397 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -16,8 +16,8 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryServerDescription"
         app:layout_constraintEnd_toStartOf="@id/itemRoomDirectoryServerRemove"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 98446b92c7..93a36c6b5d 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -29,8 +29,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/item_settings_three_pid_delete"
         app:layout_constraintStart_toEndOf="@+id/item_settings_three_pid_icon"
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index bf3fd9fafc..b8ef252218 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -27,8 +27,8 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/uploadsFileSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/uploadsFileActionDownload"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index e2b0566fdb..90665964c3 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -14,8 +14,8 @@
         android:id="@+id/itemVerificationWaitingTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
-        android:textSize="16sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemVerificationWaitingProgress"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 606ed12e43..ca449f5c07 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -30,8 +30,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="16sp"
             tools:text="Une erreur est survenue" />
 
         <Button

From 044e37325ef556486a27719ad99c2066fa0e53b1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 21:40:14 +0200
Subject: [PATCH 08/49] textSize 14sp ->
 android:textAppearance="@style/VectorTextAppearanceBody"

---
 vector/src/main/res/layout/activity_call.xml     |  7 +++----
 .../bottom_sheet_room_widget_permission.xml      |  2 +-
 .../res/layout/fragment_bootstrap_conclusion.xml |  2 +-
 ...fragment_bootstrap_enter_account_password.xml |  2 +-
 .../fragment_bootstrap_enter_passphrase.xml      |  2 +-
 .../layout/fragment_bootstrap_migrate_backup.xml |  2 +-
 .../res/layout/fragment_bootstrap_reauth.xml     | 10 +++++-----
 .../res/layout/fragment_bootstrap_save_key.xml   |  4 ++--
 .../layout/fragment_bootstrap_setup_recovery.xml | 16 ++++++++--------
 .../res/layout/fragment_bootstrap_waiting.xml    |  4 ++--
 .../src/main/res/layout/fragment_home_detail.xml |  2 +-
 .../src/main/res/layout/fragment_home_drawer.xml |  4 ++--
 vector/src/main/res/layout/fragment_login.xml    |  3 +--
 .../layout/fragment_login_account_created.xml    |  2 +-
 .../layout/fragment_login_signin_to_any_2.xml    |  3 +--
 .../fragment_login_signup_signin_selection.xml   |  3 +--
 .../layout/fragment_login_signup_username_2.xml  |  3 +--
 .../layout/fragment_room_preview_no_preview.xml  |  3 +--
 ...ragment_space_create_choose_private_model.xml |  2 +-
 .../layout/fragment_space_create_choose_type.xml |  4 ++--
 .../src/main/res/layout/fragment_user_list.xml   |  2 +-
 .../layout/item_bottom_sheet_message_preview.xml |  4 ++--
 .../layout/item_bottom_sheet_room_preview.xml    |  2 +-
 .../res/layout/item_completion_homeserver.xml    |  3 +--
 .../main/res/layout/item_expandable_textview.xml |  4 +---
 .../res/layout/item_form_advanced_toggle.xml     |  4 ++--
 vector/src/main/res/layout/item_form_switch.xml  |  2 +-
 .../main/res/layout/item_generic_empty_state.xml |  2 +-
 .../layout/item_notification_troubleshoot.xml    |  2 +-
 .../src/main/res/layout/item_room_category.xml   |  4 ++--
 .../src/main/res/layout/item_room_directory.xml  |  2 +-
 .../res/layout/item_settings_helper_info.xml     |  2 +-
 .../item_timeline_event_code_block_stub.xml      |  2 +-
 .../layout/item_timeline_event_default_stub.xml  |  2 +-
 .../item_timeline_event_merged_header_stub.xml   |  4 ++--
 ..._timeline_event_merged_room_creation_stub.xml |  4 ++--
 .../item_timeline_event_merged_utd_stub.xml      |  2 +-
 .../layout/item_timeline_event_notice_stub.xml   |  2 +-
 .../item_timeline_event_option_buttons_stub.xml  |  3 +--
 .../res/layout/item_timeline_event_poll_stub.xml |  2 +-
 .../layout/item_timeline_event_redacted_stub.xml |  2 +-
 .../item_timeline_event_text_message_stub.xml    |  2 +-
 vector/src/main/res/layout/item_uploads_file.xml |  2 +-
 .../main/res/layout/item_verification_notice.xml |  2 +-
 .../layout/merge_image_attachment_overlay.xml    |  4 ++--
 .../src/main/res/layout/view_current_calls.xml   |  4 ++--
 .../res/layout/view_failed_messages_warning.xml  |  4 ++--
 .../main/res/layout/view_keys_backup_banner.xml  |  2 +-
 .../main/res/layout/view_poll_result_line.xml    |  4 ++--
 vector/src/main/res/layout/view_state.xml        |  2 +-
 .../view_stub_room_member_profile_header.xml     |  5 ++---
 .../res/layout/view_stub_room_profile_header.xml |  3 +--
 vector/src/main/res/layout/view_url_preview.xml  |  6 +++---
 53 files changed, 82 insertions(+), 94 deletions(-)

diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 46b65ad746..9280784f93 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -44,11 +44,11 @@
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
         android:background="@color/element_background_light"
+        android:foreground="?attr/selectableItemBackground"
         android:visibility="gone"
+        app:cardBackgroundColor="@color/bg_call_screen"
         app:cardCornerRadius="4dp"
         app:cardElevation="4dp"
-        android:foreground="?attr/selectableItemBackground"
-        app:cardBackgroundColor="@color/bg_call_screen"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible">
@@ -121,8 +121,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="@android:color/white"
-        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/participantNameText"
@@ -136,7 +136,6 @@
         android:layout_margin="8dp"
         android:gravity="center"
         android:textColor="?colorSecondary"
-        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/callStatusText"
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index cf29601038..03fd26ecff 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -70,8 +70,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
+                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
-                android:textSize="14sp"
                 tools:text="\@foo:matrix.org" />
         </LinearLayout>
     </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
index 65de227755..129bb294b8 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
@@ -17,8 +17,8 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="@string/bootstrap_cross_signing_success"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Space
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index ec42481902..94e38e75d9 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/bootstrapAccountPasswordTil"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/enter_account_password" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 05cb3faa6d..7187073061 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -12,8 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/bootstrap_info_text_2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/ssss_passphrase_enter_til"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index f3fdc8c7f6..eea1738669 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/bootstrapRecoveryKeyEnterTil"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/bootstrap_enter_recovery" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index b5ee58c614..9cb08b27e3 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/waitingProgress"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/re_authentication_activity_title" />
@@ -31,11 +31,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorError"
-        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/buttonFlow"
-        app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/waitingProgress"
+        app:layout_constraintVertical_chainStyle="packed"
         tools:text="Authentication failed" />
 
     <Button
@@ -62,7 +62,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         app:constraint_referenced_ids="bootstrapCancelButton, bootstrapRetryButton"
-        app:layout_constraintTop_toBottomOf="@id/reAuthFailureText"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/reAuthFailureText" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index a4b6ae6b8d..76a5ee4194 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -16,8 +16,8 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="@string/bottom_sheet_save_your_recovery_key_content"
-        android:textColor="?vctr_content_primary"
-        android:textSize="14sp" />
+        android:textAppearance="@style/VectorTextAppearanceBody"
+        android:textColor="?vctr_content_primary" />
 
     <TextView
         android:id="@+id/bootstrapRecoveryKeyText"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index c05b5f8d1c..1945b9bbf2 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -16,8 +16,8 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="@string/bottom_sheet_setup_secure_backup_subtitle"
-        android:textColor="?vctr_content_primary"
-        android:textSize="14sp" />
+        android:textAppearance="@style/VectorTextAppearanceBody"
+        android:textColor="?vctr_content_primary" />
 
     <View
         android:layout_width="match_parent"
@@ -43,8 +43,8 @@
         app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_key_subtitle"
         app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_key_title"
         app:leftIcon="@drawable/ic_security_key_24dp"
-        app:tint="?vctr_content_primary"
         app:rightIcon="@drawable/ic_arrow_right"
+        app:tint="?vctr_content_primary"
         tools:visibility="visible" />
 
     <View
@@ -64,8 +64,8 @@
         app:actionDescription="@string/bottom_sheet_setup_secure_backup_security_phrase_subtitle"
         app:actionTitle="@string/bottom_sheet_setup_secure_backup_security_phrase_title"
         app:leftIcon="@drawable/ic_security_phrase_24dp"
-        app:tint="?vctr_content_primary"
         app:rightIcon="@drawable/ic_arrow_right"
+        app:tint="?vctr_content_primary"
         tools:visibility="visible" />
 
     <View
@@ -79,12 +79,12 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
         android:layout_marginEnd="16dp"
-        android:text="@string/reset_secure_backup_warning"
-        android:textColor="?colorError"
+        android:layout_marginBottom="16dp"
         android:drawablePadding="4dp"
-        android:textSize="14sp"
+        android:text="@string/reset_secure_backup_warning"
+        android:textAppearance="@style/VectorTextAppearanceBody"
+        android:textColor="?colorError"
         app:drawableStartCompat="@drawable/ic_warning_badge" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index 0aad3b1a10..979ee26105 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -14,8 +14,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/bootstrap_loading_text"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ProgressBar
@@ -32,8 +32,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:layout_constraintTop_toBottomOf="@id/bootstrapWaitingProgress"
         tools:text="Bending the spoon..." />
 
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 79ba14dba1..3a65733495 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -94,8 +94,8 @@
                         android:ellipsize="end"
                         android:gravity="start"
                         android:maxLines="1"
+                        android:textAppearance="@style/VectorTextAppearanceBody"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="14sp"
                         android:visibility="gone"
                         tools:text="@tools:sample/lorem/random"
                         tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 9133dd8d86..fbd99be528 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -150,7 +150,7 @@
         android:minHeight="52dp"
         android:padding="16dp"
         android:text="@string/settings"
-        android:textSize="14sp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:tint="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_settings_18dp"
         app:drawableTint="?vctr_content_secondary"
@@ -168,7 +168,7 @@
         android:minHeight="52dp"
         android:padding="16dp"
         android:text="@string/logout"
-        android:textSize="14sp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:tint="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_signout_18dp"
         app:drawableTint="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 24714aca83..8ea84e3185 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -153,8 +153,7 @@
                     android:gravity="center"
                     android:text="@string/login_social_continue"
                     android:textAppearance="@style/VectorTextAppearanceBody"
-                    android:textColor="?vctr_content_secondary"
-                    android:textSize="14sp" />
+                    android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
                     android:id="@+id/loginSocialLoginButtons"
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index b6e7f4beb4..15e1f36a9e 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -99,8 +99,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/login_account_created_message"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="14sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@+id/loginAccountCreatedMemberName"
                     app:layout_constraintTop_toBottomOf="@+id/loginAccountCreatedMemberName" />
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
index 8d7ea34f8a..2947db75b8 100644
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -125,8 +125,7 @@
                     android:gravity="center"
                     android:text="@string/login_social_continue"
                     android:textAppearance="@style/VectorTextAppearanceBody"
-                    android:textColor="?vctr_content_secondary"
-                    android:textSize="14sp" />
+                    android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
                     android:id="@+id/loginSocialLoginButtons"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index c16fabc81c..a916dff0f4 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -105,8 +105,7 @@
                     android:gravity="center"
                     android:text="@string/login_social_continue"
                     android:textAppearance="@style/VectorTextAppearanceBody"
-                    android:textColor="?vctr_content_secondary"
-                    android:textSize="14sp" />
+                    android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
                     android:id="@+id/loginSignupSigninSocialLoginButtons"
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
index 25ec1ea52a..826fe5c918 100644
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -88,8 +88,7 @@
                     android:gravity="center"
                     android:text="@string/login_social_continue"
                     android:textAppearance="@style/VectorTextAppearanceBody"
-                    android:textColor="?vctr_content_secondary"
-                    android:textSize="14sp" />
+                    android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
                     android:id="@+id/loginSocialLoginButtons"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 8b872778e2..11fea7c752 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -117,9 +117,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
                     android:gravity="center"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary"
-                    android:textSize="14sp"
                     tools:text="@string/room_preview_no_preview" />
 
                 <TextView
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index d6709c2994..4b7de7cccd 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -28,8 +28,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="center"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             app:layout_constraintTop_toBottomOf="@id/headerText"
             tools:text="@string/create_spaces_make_sure_access" />
 
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 7213e91f9f..fa145f364a 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -40,8 +40,8 @@
             android:layout_marginBottom="24dp"
             android:gravity="center"
             android:text="@string/create_spaces_join_info_help"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             app:layout_constraintBottom_toTopOf="@id/publicButton" />
 
         <im.vector.app.features.spaces.create.WizardButtonView
@@ -77,8 +77,8 @@
             android:layout_marginBottom="24dp"
             android:gravity="center"
             android:text="@string/create_spaces_you_can_change_later"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 135ff11714..477930a688 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -114,8 +114,8 @@
         android:layout_margin="16dp"
         android:drawablePadding="8dp"
         android:text="@string/settings_hs_admin_e2e_disabled"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         android:visibility="gone"
         app:layout_constraintTop_toBottomOf="@id/userListFilterDivider"
         tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 61b53f9c13..3f9457aa78 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -31,8 +31,8 @@
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
@@ -74,9 +74,9 @@
         android:layout_marginBottom="4dp"
         android:ellipsize="end"
         android:maxLines="3"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:textIsSelectable="false"
-        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@+id/bottom_sheet_message_preview_body_details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index bb652a6890..10182e4543 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -34,8 +34,8 @@
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintEnd_toStartOf="@+id/bottomSheetRoomPreviewLowPriority"
diff --git a/vector/src/main/res/layout/item_completion_homeserver.xml b/vector/src/main/res/layout/item_completion_homeserver.xml
index ec1cb037eb..40012d8bae 100644
--- a/vector/src/main/res/layout/item_completion_homeserver.xml
+++ b/vector/src/main/res/layout/item_completion_homeserver.xml
@@ -9,7 +9,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
-    android:textAppearance="?android:attr/textAppearanceLarge"
+    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?android:attr/textColorAlertDialogListItem"
-    android:textSize="14sp"
     tools:text="https://matrix.org" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 0fd883fccf..1c45f74402 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -13,9 +13,7 @@
         android:layout_height="wrap_content"
         android:autoLink="web"
         android:ellipsize="end"
-        android:fontFamily="sans-serif"
-        android:textSize="14sp"
-        android:textStyle="normal"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         app:layout_constraintBottom_toTopOf="@+id/expandableArrow"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_form_advanced_toggle.xml b/vector/src/main/res/layout/item_form_advanced_toggle.xml
index 1e2a4df441..5bb747b52c 100644
--- a/vector/src/main/res/layout/item_form_advanced_toggle.xml
+++ b/vector/src/main/res/layout/item_form_advanced_toggle.xml
@@ -24,11 +24,11 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         android:textStyle="bold"
         app:drawableTint="?vctr_content_secondary"
-        tools:drawableEnd="@drawable/ic_expand_more_white"
+        tools:drawableEnd="@drawable/ic_expand_more"
         tools:text="@string/show_advanced" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 1db25f4c27..79dd430209 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -29,8 +29,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
         app:layout_constraintStart_toStartOf="@+id/formSwitchTitle"
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index ef33ec3be7..c72edc72a8 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -48,8 +48,8 @@
         android:gravity="center"
         android:maxWidth="300dp"
         android:maxLines="10"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@+id/emptyItemButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index b3b21e5480..a02f504a7e 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -27,8 +27,8 @@
         android:layout_marginEnd="16dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/troubleshootTestDescription"
         app:layout_constraintEnd_toStartOf="@+id/troubleshootStatusIcon"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index 2e890ec9e3..b24ff770c8 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -24,11 +24,11 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         android:textStyle="bold"
         app:drawableTint="?vctr_content_secondary"
-        tools:drawableEnd="@drawable/ic_expand_more_white"
+        tools:drawableEnd="@drawable/ic_expand_more"
         tools:text="@string/room_participants_header_direct_chats" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 51b1f4d5f8..72ed6fdf07 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -54,8 +54,8 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemRoomDirectoryChecked"
diff --git a/vector/src/main/res/layout/item_settings_helper_info.xml b/vector/src/main/res/layout/item_settings_helper_info.xml
index 0dbd104135..1cb39218ae 100644
--- a/vector/src/main/res/layout/item_settings_helper_info.xml
+++ b/vector/src/main/res/layout/item_settings_helper_info.xml
@@ -10,7 +10,7 @@
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp"
+    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?vctr_content_secondary"
-    android:textSize="14sp"
     tools:drawableStart="@drawable/vector_warning_red"
     tools:text="If you don’t want this, opt out below. You can also manage any of these preferences in Settings." />
diff --git a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
index 7889efacc4..cb318026a6 100644
--- a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
@@ -13,7 +13,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="monospace"
-            android:textSize="14sp" />
+            android:textAppearance="@style/VectorTextAppearanceBody" />
 
     </HorizontalScrollView>
 
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index f32d9cf813..751abd70b3 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -23,8 +23,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorSecondary"
-        android:textSize="14sp"
         android:textStyle="italic"
         tools:text="@string/rendering_event_error_type_of_event_not_handled" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index 0e38f3be57..3eee2714e8 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -30,8 +30,8 @@
             android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?colorSecondary"
-            android:textSize="14sp"
             android:textStyle="italic" />
 
     </RelativeLayout>
@@ -48,9 +48,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:textIsSelectable="false"
-        android:textSize="14sp"
         tools:text="3 membership changes" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 289489d98f..f6f3bcd712 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -166,8 +166,8 @@
             android:layout_marginBottom="8dp"
             android:layout_toStartOf="@id/itemMergedExpandTextView"
             android:layout_toEndOf="@id/itemNoticeAvatarView"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             android:textStyle="italic"
             tools:text="@string/room_created_summary_item" />
 
@@ -183,8 +183,8 @@
             android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?colorSecondary"
-            android:textSize="14sp"
             android:textStyle="italic" />
 
     </RelativeLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 037939e396..06bcd02351 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -60,8 +60,8 @@
             android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?colorSecondary"
-            android:textSize="14sp"
             android:textStyle="italic"
             android:visibility="gone"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index f924ca6dd5..30d26df243 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -23,8 +23,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         android:textStyle="italic"
         tools:text="@string/notice_avatar_url_changed" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index 9643144d20..2f8bf3420b 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -10,9 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
-        android:textStyle="normal"
         tools:text="What would you like to do?" />
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index 69b91270b5..f32f261a5a 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -27,8 +27,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginStart="4dp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_primary"
-            android:textSize="14sp"
             android:textStyle="bold"
             tools:text="What would you like to do?" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index 28bf58bcff..8bb58d14ff 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -5,7 +5,7 @@
     android:drawablePadding="8dp"
     android:gravity="center_vertical"
     android:text="@string/event_redacted"
+    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?vctr_content_tertiary"
-    android:textSize="14sp"
     app:drawableStartCompat="@drawable/ic_trash_16"
     app:drawableTint="?vctr_content_tertiary" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 66373100c1..c4fbed71fc 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -10,8 +10,8 @@
         android:id="@+id/messageTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         tools:text="@sample/messages.json/data/message" />
 
     <im.vector.app.features.home.room.detail.timeline.url.PreviewUrlView
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index b8ef252218..ac11096a6b 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -43,8 +43,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:ellipsize="end"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/uploadsFileTitle"
         app:layout_constraintStart_toStartOf="@+id/uploadsFileTitle"
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index eb4a82a9be..7fe4dd48ba 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -8,6 +8,6 @@
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp"
+    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?vctr_content_primary"
-    android:textSize="14sp"
     tools:text="todo" />
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index 65dd374fc6..10ec4bc4e2 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -43,8 +43,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorOnPrimary"
-        android:textSize="14sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/overlayInfoText"
         app:layout_constraintEnd_toStartOf="@id/overlayShareButton"
@@ -60,8 +60,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorOnPrimary"
-        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
         app:layout_constraintEnd_toStartOf="@id/overlayShareButton"
         app:layout_constraintStart_toStartOf="@id/overlayCounterText"
diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml
index 7d9765d407..c985b1e9de 100644
--- a/vector/src/main/res/layout/view_current_calls.xml
+++ b/vector/src/main/res/layout/view_current_calls.xml
@@ -20,8 +20,8 @@
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
         android:text="@string/call_only_active"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorOnPrimary"
-        android:textSize="14sp"
         app:drawableStartCompat="@drawable/ic_call_answer"
         app:drawableTint="?colorOnPrimary" />
 
@@ -39,7 +39,7 @@
         android:paddingStart="8dp"
         android:paddingEnd="16dp"
         android:text="@string/action_return"
-        android:textSize="14sp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textStyle="bold" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index 871844a22a..dff0b581f4 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -27,8 +27,8 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:text="@string/event_status_failed_messages_warning"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         app:drawableStartCompat="@drawable/ic_sending_message_failed"
         app:layout_constraintBottom_toBottomOf="@id/failedMessagesRetryButton"
         app:layout_constraintEnd_toStartOf="@+id/failedMessagesDeleteAllButton"
@@ -54,7 +54,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:text="@string/global_retry"
-        android:textSize="14sp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         app:icon="@drawable/ic_retry_sending_messages"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 63ec310ce6..52ee0314f8 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -48,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
         android:text="@string/secure_backup_banner_setup_line2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/view_keys_backup_banner_space2"
         app:layout_constraintEnd_toStartOf="@id/view_keys_backup_banner_barrier"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
index 4718f59af3..df8cc27c89 100644
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ b/vector/src/main/res/layout/view_poll_result_line.xml
@@ -25,8 +25,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         tools:text="Open a Github Issue" />
 
 
@@ -35,7 +35,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         tools:text="47%" />
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index ca449f5c07..38a297a4ad 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -96,8 +96,8 @@
             android:layout_gravity="center"
             android:layout_marginTop="20dp"
             android:gravity="center"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 1d38fef08a..1b4f4e98d8 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -60,8 +60,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginBottom="16dp"
             android:gravity="center"
-            android:textAppearance="@style/Vector.Toolbar.Title"
-            android:textSize="14sp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/memberProfilePowerLevelView"
             app:layout_constraintEnd_toEndOf="parent"
@@ -88,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textSize="14sp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 15135294ea..2e4db9b2a9 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -51,8 +51,7 @@
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:singleLine="true"
-        android:textAppearance="@style/Vector.Toolbar.Title"
-        android:textSize="14sp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml
index c99d1b42f5..8ec098ea7e 100644
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@@ -23,8 +23,8 @@
         android:layout_marginStart="7dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="14sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/url_preview_close"
         app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
@@ -51,8 +51,8 @@
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:maxLines="4"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
         app:layout_constraintTop_toBottomOf="@+id/url_preview_image"
@@ -67,8 +67,8 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:singleLine="true"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_tertiary"
-        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
         app:layout_constraintTop_toBottomOf="@+id/url_preview_description"

From 03df4aac778261ffac3bcd556cba61e039736380 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 14 Jun 2021 21:46:05 +0200
Subject: [PATCH 09/49] Cleanup

---
 tools/check/forbidden_strings_in_resources.txt               | 5 ++++-
 .../res/layout/item_create_direct_room_letter_header.xml     | 1 -
 vector/src/main/res/layout/item_room_widget.xml              | 1 -
 .../layout/item_timeline_event_merged_room_creation_stub.xml | 2 --
 .../main/res/layout/item_user_directory_letter_header.xml    | 1 -
 vector/src/main/res/layout/item_user_list_header.xml         | 1 -
 vector/src/main/res/layout/view_space_type_button.xml        | 1 -
 7 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 4ebc4008c1..474fb03508 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -106,4 +106,7 @@ layout_constraintLeft_
 colorAccent
 
 ### Use MaterialCardView
-<androidx\.cardview\.widget\.CardView
\ No newline at end of file
+<androidx\.cardview\.widget\.CardView
+
+### Useless attribute, please remove
+android:textStyle=\"normal\"
diff --git a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
index 9dd6642c4f..1a7cd16176 100644
--- a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
@@ -10,5 +10,4 @@
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
     android:textSize="20sp"
-    android:textStyle="normal"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room_widget.xml b/vector/src/main/res/layout/item_room_widget.xml
index f5e027c527..5a3905bf45 100644
--- a/vector/src/main/res/layout/item_room_widget.xml
+++ b/vector/src/main/res/layout/item_room_widget.xml
@@ -40,7 +40,6 @@
         android:id="@+id/roomWidgetUrl"
         style="@style/BottomSheetItemTextSecondary"
         android:layout_marginEnd="8dp"
-        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/roomWidgetEditable"
         app:layout_constraintStart_toStartOf="@id/roomWidgetName"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index f6f3bcd712..437cb2f4bd 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -83,7 +83,6 @@
             android:layout_marginEnd="16dp"
             android:textColor="?vctr_content_secondary"
             android:textSize="15sp"
-            android:textStyle="normal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/roomNameTileText"
@@ -97,7 +96,6 @@
             android:textColor="?vctr_content_secondary"
             android:textColorLink="?colorPrimary"
             android:textSize="15sp"
-            android:textStyle="normal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/roomNameDescriptionText"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index c63f84f412..d33d5d4cfb 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -10,5 +10,4 @@
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
     android:textSize="20sp"
-    android:textStyle="normal"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index af1d0dec90..e3aae0e570 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -10,5 +10,4 @@
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
     android:textSize="20sp"
-    android:textStyle="normal"
     tools:text="Recents | Contacts" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index d5f8580aff..4f28160de9 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -47,7 +47,6 @@
         android:gravity="start"
         android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
         app:layout_constraintStart_toEndOf="@id/buttonImageView"

From f384ec0601233d147f189925d7880ca52591ec17 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 21:53:51 +0200
Subject: [PATCH 10/49] textSize 14sp ->
 android:textAppearance="@style/VectorTextAppearanceHeadlineM"

---
 .../main/res/layout/bottom_sheet_logout_and_backup.xml    | 2 +-
 .../res/layout/bottom_sheet_room_widget_permission.xml    | 8 +++++---
 vector/src/main/res/layout/fragment_contacts_book.xml     | 2 +-
 .../fragment_create_direct_room_directory_users.xml       | 2 +-
 vector/src/main/res/layout/fragment_create_room.xml       | 2 +-
 .../main/res/layout/fragment_keys_backup_setup_step1.xml  | 2 +-
 vector/src/main/res/layout/fragment_matrix_profile.xml    | 2 +-
 .../main/res/layout/fragment_recyclerview_with_search.xml | 2 +-
 vector/src/main/res/layout/fragment_room_detail.xml       | 2 +-
 .../main/res/layout/fragment_room_preview_no_preview.xml  | 2 +-
 .../src/main/res/layout/fragment_room_setting_generic.xml | 2 +-
 vector/src/main/res/layout/fragment_room_uploads.xml      | 2 +-
 vector/src/main/res/layout/fragment_space_add_rooms.xml   | 2 +-
 vector/src/main/res/layout/fragment_space_preview.xml     | 2 +-
 .../res/layout/fragment_ssss_access_from_passphrase.xml   | 5 +++--
 vector/src/main/res/layout/fragment_user_code_show.xml    | 2 +-
 vector/src/main/res/layout/fragment_user_directory.xml    | 2 +-
 vector/src/main/res/layout/fragment_user_list.xml         | 2 +-
 vector/src/main/res/layout/item_bottom_sheet_title.xml    | 2 +-
 vector/src/main/res/layout/item_help_footer.xml           | 2 +-
 vector/src/main/res/layout/item_room_alias_text_input.xml | 4 ++--
 .../src/main/res/layout/item_settings_section_title.xml   | 2 +-
 vector/src/main/res/layout/item_simple_reaction_info.xml  | 2 +-
 vector/src/main/res/layout/view_keys_backup_banner.xml    | 2 +-
 24 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index 847fc65837..c45dd60b91 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -17,8 +17,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:text="@string/action_sign_out"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
-        android:textSize="18sp"
         android:textStyle="bold" />
 
     <TextView
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 03fd26ecff..6d9f17abdd 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -60,10 +60,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
+                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary"
-                android:textSize="18sp"
                 android:textStyle="bold"
-                tools:text="User name" />
+                tools:text="@sample/users.json/data/displayName" />
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerId"
@@ -72,8 +72,10 @@
                 android:textAlignment="center"
                 android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
-                tools:text="\@foo:matrix.org" />
+                tools:text="@sample/users.json/data/id" />
+
         </LinearLayout>
+
     </LinearLayout>
 
     <TextView
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index 8e98a0b1af..5fcd1f3063 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -48,8 +48,8 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/contacts_book_title"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 12452868cd..7cd03ba010 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -48,8 +48,8 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/direct_chats_header"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index 1d2edac40e..04d82c2a22 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -45,8 +45,8 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/create_room_title"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index 36bc1a556b..b08690bdcf 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -30,8 +30,8 @@
         android:layout_margin="16dp"
         android:text="@string/keys_backup_setup_step1_title"
         android:textAlignment="center"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
-        android:textSize="18sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_description"
         app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step1_image"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 5f42580a22..be564f96c0 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -79,8 +79,8 @@
                         android:alpha="0"
                         android:ellipsize="end"
                         android:maxLines="1"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/matrixProfileToolbarAvatarImageView"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index efdbdfea1f..1abd5086b8 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -43,8 +43,8 @@
                     android:ellipsize="end"
                     android:gravity="start|center"
                     android:maxLines="1"
+                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
                     android:textStyle="bold"
                     tools:text="@tools:sample/lorem/random" />
 
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 1013120134..dcef10e1a4 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -52,8 +52,8 @@
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
+                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
                     app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="0.0"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 11fea7c752..4242d72ce6 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -45,8 +45,8 @@
                         android:layout_marginEnd="8dp"
                         android:ellipsize="end"
                         android:maxLines="1"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index cf41d67a35..be03c351f3 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -54,8 +54,8 @@
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
+                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index 3ebed9ab44..dcef1b9c4e 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -52,8 +52,8 @@
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
+                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/roomUploadsToolbarAvatarImageView"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 786bda0c95..30313f7f82 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -42,8 +42,8 @@
                     android:gravity="start|center"
                     android:maxLines="1"
                     android:text="@string/space_add_existing_rooms"
+                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
                     android:textStyle="bold" />
 
                 <TextView
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 6096c33d2f..be79ce4341 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -59,8 +59,8 @@
                         android:layout_marginEnd="8dp"
                         android:ellipsize="end"
                         android:maxLines="1"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.0"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 8409aa087e..20bda4aa66 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -102,8 +102,8 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/or"
+            android:textAppearance="@style/VectorTextAppearanceHeadlineM"
             android:textColor="?vctr_content_primary"
-            android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_submit" />
@@ -119,7 +119,8 @@
             app:layout_constraintBottom_toTopOf="@+id/ssss_passphrase_reset"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or" />
+            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or"
+            tools:ignore="MissingPrefix" />
 
         <im.vector.app.core.ui.views.BottomSheetActionButton
             android:id="@+id/ssss_passphrase_reset"
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 2bcc7cac0e..099e20a300 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -44,8 +44,8 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/add_by_qr_code"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 8c59e0101f..897fda6d2c 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -48,8 +48,8 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/direct_chats_header"
+                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="18sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 477930a688..bd41159199 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -43,8 +43,8 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:text="@string/fab_menu_create_chat"
+                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index 2ee53ee3aa..0c9da51647 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -14,8 +14,8 @@
         android:id="@+id/itemBottomSheetTitleTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
-        android:textSize="18sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemBottomSheetTitleSubtitle"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index befcda4281..2045e0be1c 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -28,8 +28,8 @@
         android:layout_marginStart="12dp"
         android:gravity="start"
         android:maxWidth="240dp"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_secondary"
-        android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/itemHelpPicto"
diff --git a/vector/src/main/res/layout/item_room_alias_text_input.xml b/vector/src/main/res/layout/item_room_alias_text_input.xml
index f9ab547907..46ae5119c6 100644
--- a/vector/src/main/res/layout/item_room_alias_text_input.xml
+++ b/vector/src/main/res/layout/item_room_alias_text_input.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:text="@string/matrix_room_alias_prefix"
-        android:textSize="18sp"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         app:layout_constraintBaseline_toBaselineOf="@+id/itemRoomAliasTextInputLayout"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -46,7 +46,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:maxWidth="200dp"
-        android:textSize="18sp"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         app:layout_constraintBaseline_toBaselineOf="@+id/itemRoomAliasTextInputLayout"
         app:layout_constraintEnd_toEndOf="parent"
         tools:text=":matrix.org" />
diff --git a/vector/src/main/res/layout/item_settings_section_title.xml b/vector/src/main/res/layout/item_settings_section_title.xml
index 2f11a4657a..6416935a25 100644
--- a/vector/src/main/res/layout/item_settings_section_title.xml
+++ b/vector/src/main/res/layout/item_settings_section_title.xml
@@ -9,7 +9,7 @@
     android:paddingTop="@dimen/layout_vertical_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="@dimen/layout_vertical_margin"
+    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
     android:textColor="?vctr_content_primary"
-    android:textSize="18sp"
     android:textStyle="bold"
     tools:text="Title" />
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 74474a0713..c07c1072ac 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -17,8 +17,8 @@
         android:layout_marginEnd="8dp"
         android:gravity="center"
         android:lines="1"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="@color/emoji_color"
-        android:textSize="18sp"
         tools:text="@sample/reactions.json/data/reaction" />
 
     <TextView
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 52ee0314f8..ddeff897f2 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -35,8 +35,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
         android:text="@string/secure_backup_banner_setup_line1"
+        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
-        android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@id/view_keys_backup_banner_text_2"
         app:layout_constraintEnd_toStartOf="@id/view_keys_backup_banner_barrier"
         app:layout_constraintStart_toEndOf="@id/view_keys_backup_banner_picto"

From 1769e9b7510dce5810e0117d84f3ac014f612b85 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 22:10:12 +0200
Subject: [PATCH 11/49] textSize 15sp ->
 android:textAppearance="@style/VectorTextAppearanceSubtitle or Body

---
 vector/sampledata/users.json                           |  6 +++---
 .../main/res/layout/alerter_incoming_call_layout.xml   |  4 ++--
 .../main/res/layout/bottom_sheet_space_settings.xml    |  4 ++--
 .../main/res/layout/fragment_bootstrap_save_key.xml    |  2 +-
 vector/src/main/res/layout/fragment_home_drawer.xml    |  4 ++--
 .../res/layout/fragment_keys_backup_setup_step2.xml    |  2 +-
 .../res/layout/fragment_keys_backup_setup_step3.xml    |  6 +++---
 .../main/res/layout/fragment_login_account_created.xml |  2 +-
 .../res/layout/fragment_matrix_to_room_space_card.xml  |  8 ++++----
 .../main/res/layout/fragment_matrix_to_user_card.xml   |  4 ++--
 .../res/layout/fragment_room_preview_no_preview.xml    |  5 ++---
 vector/src/main/res/layout/fragment_ssss_reset_all.xml |  4 ++--
 vector/src/main/res/layout/fragment_user_code_show.xml |  6 +++---
 vector/src/main/res/layout/item_bottom_sheet_radio.xml |  4 ++--
 vector/src/main/res/layout/item_bottom_sheet_title.xml |  2 +-
 vector/src/main/res/layout/item_contact_action.xml     |  2 +-
 vector/src/main/res/layout/item_contact_detail.xml     |  4 ++--
 vector/src/main/res/layout/item_contact_main.xml       |  2 +-
 .../main/res/layout/item_create_direct_room_user.xml   |  4 ++--
 vector/src/main/res/layout/item_form_switch.xml        |  2 +-
 .../src/main/res/layout/item_generic_empty_state.xml   |  2 +-
 vector/src/main/res/layout/item_generic_header.xml     |  2 +-
 vector/src/main/res/layout/item_generic_with_value.xml |  2 +-
 vector/src/main/res/layout/item_group.xml              |  2 +-
 vector/src/main/res/layout/item_known_user.xml         |  4 ++--
 vector/src/main/res/layout/item_public_room.xml        |  6 +++---
 vector/src/main/res/layout/item_room.xml               |  8 ++++----
 vector/src/main/res/layout/item_room_directory.xml     |  2 +-
 .../src/main/res/layout/item_room_directory_server.xml |  2 +-
 vector/src/main/res/layout/item_room_filter_footer.xml |  4 ++--
 vector/src/main/res/layout/item_room_invitation.xml    |  4 ++--
 .../src/main/res/layout/item_room_to_add_in_space.xml  |  2 +-
 .../main/res/layout/item_room_to_manage_in_space.xml   |  2 +-
 vector/src/main/res/layout/item_search_result.xml      |  2 +-
 .../res/layout/item_settings_button_single_line.xml    |  2 +-
 vector/src/main/res/layout/item_settings_edit_text.xml |  2 +-
 .../src/main/res/layout/item_settings_simple_item.xml  |  4 ++--
 vector/src/main/res/layout/item_space.xml              | 10 +++++-----
 vector/src/main/res/layout/item_space_add.xml          |  2 +-
 vector/src/main/res/layout/item_space_beta_header.xml  |  8 ++++----
 vector/src/main/res/layout/item_space_roomchild.xml    |  4 ++--
 vector/src/main/res/layout/item_space_subspace.xml     |  2 +-
 vector/src/main/res/layout/item_space_top_summary.xml  |  2 +-
 vector/src/main/res/layout/item_sub_space.xml          |  2 +-
 vector/src/main/res/layout/item_suggested_room.xml     |  4 ++--
 .../src/main/res/layout/item_timeline_event_base.xml   |  2 +-
 .../res/layout/item_timeline_event_call_tile_stub.xml  |  2 +-
 .../res/layout/item_timeline_event_day_separator.xml   |  2 +-
 .../item_timeline_event_merged_room_creation_stub.xml  |  4 ++--
 .../res/layout/item_timeline_event_merged_utd_stub.xml |  2 +-
 .../layout/item_timeline_event_status_tile_stub.xml    |  2 +-
 .../layout/item_timeline_event_verification_stub.xml   |  2 +-
 .../res/layout/item_timeline_event_widget_stub.xml     |  2 +-
 .../src/main/res/layout/item_timeline_read_marker.xml  |  4 ++--
 vector/src/main/res/layout/item_unknown_room.xml       |  2 +-
 vector/src/main/res/layout/item_user.xml               |  4 ++--
 .../main/res/layout/view_active_conference_view.xml    |  1 -
 vector/src/main/res/layout/view_state.xml              |  2 +-
 58 files changed, 96 insertions(+), 98 deletions(-)

diff --git a/vector/sampledata/users.json b/vector/sampledata/users.json
index 0a49d27450..d1b1758db3 100644
--- a/vector/sampledata/users.json
+++ b/vector/sampledata/users.json
@@ -1,15 +1,15 @@
 {
   "data": [
     {
-      "displayName": "amandine",
+      "displayName": "Amandine",
       "id": "@amandine:matrix.org"
     },
     {
-      "displayName": "benoit",
+      "displayName": "Benoit",
       "id": "@benoit:matrix.org"
     },
     {
-      "displayName": "gaelle",
+      "displayName": "Gaelle",
       "id": "@gawa:matrix.org"
     },
     {
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index d1d1812d0a..820e9de797 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -28,8 +28,8 @@
         android:layout_marginEnd="12dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
         app:layout_constraintStart_toEndOf="@id/incomingCallAvatar"
@@ -45,8 +45,8 @@
         android:drawablePadding="4dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:drawableTint="?vctr_content_secondary"
         app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
         app:layout_constraintStart_toStartOf="@id/incomingCallNameView"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index c4f2bb924b..40c7bca33a 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -33,8 +33,8 @@
             android:duplicateParentState="true"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@+id/spaceDescription"
@@ -63,8 +63,8 @@
             android:layout_marginEnd="8dp"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index 76a5ee4194..ae270b8f83 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -28,8 +28,8 @@
         android:fontFamily="monospace"
         android:gravity="center_horizontal"
         android:padding="4dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_notice_secondary"
-        android:textSize="15sp"
         tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
 
 
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index fbd99be528..c0b3a209a0 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -50,8 +50,8 @@
             android:layout_marginEnd="8dp"
             android:maxLines="1"
             android:singleLine="true"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
@@ -64,8 +64,8 @@
             android:layout_marginEnd="8dp"
             android:maxLines="1"
             android:singleLine="true"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:layout_constraintBottom_toTopOf="@+id/homeDrawerInviteFriendButton"
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 42d8b1f97f..9606096e0f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -40,8 +40,8 @@
             android:layout_marginBottom="16dp"
             android:text="@string/keys_backup_setup_step2_text_description"
             android:textAlignment="center"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step2_text_title" />
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 97c178c932..f7c1fb8a0e 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -50,8 +50,8 @@
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:text="@string/keys_backup_setup_step3_text_line1"
             android:textAlignment="center"
-            android:textColor="?vctr_content_primary"
-            android:textSize="15sp" />
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
+            android:textColor="?vctr_content_primary" />
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_label2"
@@ -61,8 +61,8 @@
             android:layout_marginTop="20dp"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:textAlignment="center"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             tools:text="@string/keys_backup_setup_step3_text_line2" />
 
 
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 15e1f36a9e..90075330f6 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -74,8 +74,8 @@
                     android:layout_marginEnd="4dp"
                     android:ellipsize="end"
                     android:maxLines="1"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="15sp"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@+id/loginAccountCreatedTime"
                     app:layout_constraintStart_toEndOf="@+id/loginAccountCreatedAvatar"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index d02ad68bdb..6d80ae8489 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -48,8 +48,8 @@
             android:maxLines="1"
             android:singleLine="true"
             android:textAlignment="textStart"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
             tools:text="@sample/rooms.json/data/name" />
@@ -62,8 +62,8 @@
             android:maxLines="1"
             android:singleLine="true"
             android:textAlignment="textStart"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
             app:layout_goneMarginTop="0dp"
@@ -147,8 +147,8 @@
             android:autoLink="web"
             android:maxLines="4"
             android:textAlignment="textStart"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
             tools:text="@sample/rooms.json/data/topic" />
 
@@ -214,8 +214,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="@id/knownMember1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/knownMember5"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 995759dc4b..3d5b5a600e 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -29,8 +29,8 @@
         android:maxLines="1"
         android:singleLine="true"
         android:textAlignment="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
         tools:text="@sample/users.json/data/displayName" />
 
@@ -44,8 +44,8 @@
         android:maxLines="1"
         android:singleLine="true"
         android:textAlignment="center"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
         tools:text="@sample/users.json/data/id" />
 
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 4242d72ce6..0484ed3a30 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -94,9 +94,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="56dp"
                     android:gravity="center"
-                    android:textAppearance="@style/VectorTextAppearanceTitle"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="15sp"
                     android:textStyle="bold"
                     tools:text="@sample/rooms.json/data/name" />
 
@@ -127,8 +126,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
                     android:gravity="center"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?colorError"
-                    android:textSize="15sp"
                     android:visibility="gone"
                     tools:text="Error"
                     tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index ce402215a5..c45d91199a 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -66,8 +66,8 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:text="@string/secure_backup_reset_if_you_reset_all"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?colorError"
-            android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_other_devices" />
@@ -81,8 +81,8 @@
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
             android:text="@string/secure_backup_reset_no_history"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_text3" />
 
         <Button
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 099e20a300..4b91494241 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -109,8 +109,8 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textAlignment="center"
+                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
-                    android:textSize="15sp"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="@sample/users.json/data/displayName" />
 
@@ -124,8 +124,8 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textAlignment="center"
+                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary"
-                    android:textSize="15sp"
                     app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
                     tools:text="@sample/users.json/data/id" />
 
@@ -163,8 +163,8 @@
             android:layout_marginEnd="16dp"
             android:text="@string/user_code_info_text"
             android:textAlignment="center"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="@id/showUserCodeCard"
             app:layout_constraintStart_toStartOf="@id/showUserCodeCard"
             app:layout_constraintTop_toBottomOf="@id/showUserCodeCard" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
index 0da96725bb..0cbf6a1eb9 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_radio.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -31,8 +31,8 @@
         android:layout_marginStart="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
@@ -46,8 +46,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:maxLines="4"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/actionTitle"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index 0c9da51647..e5f77096d0 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -28,8 +28,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index 27c680555f..ac286fe580 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -28,8 +28,8 @@
         android:layout_weight="1"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         tools:text="@string/invite_friends" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 59f43472b6..7268f9d278 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -17,8 +17,8 @@
         android:layout_marginStart="60dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toTopOf="@id/contactDetailMatrixId"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,8 +33,8 @@
         android:layout_gravity="center_vertical"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index d4300191f7..e867e2da55 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -29,7 +29,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 690b292de8..d5e0964571 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -47,8 +47,8 @@
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/createDirectRoomUserID"
         app:layout_constraintEnd_toEndOf="parent"
@@ -63,8 +63,8 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 79dd430209..5adf720a63 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -15,8 +15,8 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:duplicateParentState="true"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toTopOf="@+id/formSwitchSummary"
         app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index c72edc72a8..138bc59cd5 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -28,8 +28,8 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="30dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/emptyItemMessageView"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 6dbf68cd11..f01bf4a3e0 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -8,7 +8,7 @@
     android:paddingTop="4dp"
     android:paddingEnd="16dp"
     android:paddingBottom="4dp"
+    android:textAppearance="@style/VectorTextAppearanceSubtitle"
     android:textColor="?vctr_notice_text_color"
-    android:textSize="15sp"
     android:textStyle="bold"
     tools:text="Today" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index ddeb03c21b..a3b8c46e1f 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -35,8 +35,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="0dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         tools:text="Value"
         tools:textColor="?colorPrimary" />
 
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index f28d399d35..c257ee5052 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -31,8 +31,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toStartOf="@+id/groupAvatarChevron"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 1941aa9cda..7f44e78ca7 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -46,8 +46,8 @@
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/knownUserID"
         app:layout_constraintEnd_toEndOf="parent"
@@ -62,8 +62,8 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index d5bd16e5b5..049907b09d 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -31,8 +31,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomTopic"
         app:layout_constraintEnd_toStartOf="@+id/itemPublicRoomButtonState"
@@ -69,8 +69,8 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:minWidth="56dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:drawableStartCompat="@drawable/ic_user"
         app:drawableTint="?vctr_content_secondary"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
@@ -88,8 +88,8 @@
         android:maxLines="1"
         android:minWidth="40dp"
         android:singleLine="true"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index c8021126bd..ba5b3f5671 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -105,8 +105,8 @@
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toStartOf="@+id/roomDraftBadge"
@@ -159,8 +159,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/roomNameView"
@@ -174,8 +174,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomNameView"
@@ -189,8 +189,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorPrimary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 72ed6fdf07..11f2fd6ad5 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -34,8 +34,8 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryDescription"
         app:layout_constraintEnd_toStartOf="@+id/itemRoomDirectoryChecked"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index a6a52e0397..2d2e9207e1 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -36,8 +36,8 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/itemRoomDirectoryServerRemove"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index e1a44f91c8..21dc303682 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -11,8 +11,8 @@
         android:layout_gravity="center"
         android:layout_marginTop="56dp"
         android:text="@string/room_filtering_footer_title"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="15sp" />
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="?vctr_content_secondary" />
 
     <Button
         android:id="@+id/roomFilterFooterCreateRoom"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 3d992b32ad..d6e6388fd3 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -41,8 +41,8 @@
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         app:drawableEndCompat="@drawable/ic_arrow_right"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -59,8 +59,8 @@
         android:layout_marginTop="3dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
         app:layout_constraintStart_toStartOf="@+id/roomInvitationNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomInvitationNameView"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 54047e6c4b..c9a1dacc79 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -30,8 +30,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index d887b727c8..79a42c09a7 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -30,8 +30,8 @@
         android:layout_marginEnd="4dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemManageRoomSuggested"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index dccce2b462..6eabb73b2d 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -27,8 +27,8 @@
         android:layout_marginEnd="4dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
         app:layout_constraintStart_toEndOf="@+id/messageAvatarImageView"
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index 61938c8841..de91d6aa8b 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -17,8 +17,8 @@
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/settings_item_button"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_settings_edit_text.xml b/vector/src/main/res/layout/item_settings_edit_text.xml
index 82a702cc9e..a2666bc1de 100644
--- a/vector/src/main/res/layout/item_settings_edit_text.xml
+++ b/vector/src/main/res/layout/item_settings_edit_text.xml
@@ -13,8 +13,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index eae4e97864..7ce05c511d 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -21,8 +21,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             android:textStyle="bold"
             tools:text="Title" />
 
@@ -32,8 +32,8 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:orientation="vertical"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             tools:text="Description / Value" />
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 248552bc01..35cd0086eb 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -63,8 +63,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/groupDescView"
         app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
@@ -75,22 +75,22 @@
 
     <TextView
         android:id="@+id/groupDescView"
-        android:visibility="gone"
-        tools:visibility="visible"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
         app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
         app:layout_constraintTop_toBottomOf="@id/groupNameView"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/lorem/random" />
+        tools:text="@tools:sample/lorem/random"
+        tools:visibility="visible" />
 
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index b2892ccf41..41ca718f71 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -36,8 +36,8 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:text="@string/add_space"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?colorPrimary"
-        android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index f7ebde6312..deabe59b93 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -13,8 +13,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/spaces_header"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:drawableEndCompat="@drawable/ic_beta_pill" />
 
@@ -23,8 +23,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/spaces_beta_welcome_to_spaces_desc"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="15sp" />
+        android:textAppearance="@style/VectorTextAppearanceBody"
+        android:textColor="?vctr_content_secondary" />
 
     <TextView
         android:id="@+id/spaceBetaFeedbackAction"
@@ -36,8 +36,8 @@
         android:paddingEnd="16dp"
         android:paddingBottom="8dp"
         android:text="@string/give_feedback"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="@color/vector_info_color"
-        android:textSize="15sp"
         app:drawableStartCompat="@drawable/ic_feedback" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index d87337439e..f4e79eb364 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -49,8 +49,8 @@
             android:layout_marginEnd="4dp"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/childRoomTopic"
             app:layout_constraintEnd_toStartOf="@id/spaceChildMemberCountIcon"
@@ -64,8 +64,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="@id/spaceChildBarrier"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index 0c231adf03..a9e89db344 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -55,8 +55,8 @@
         android:layout_marginBottom="16dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 15a63e6d68..4194b35693 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -39,8 +39,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:autoLink="all"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 62f202c8f0..2e31f7b854 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -63,8 +63,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 9a18de06a1..c9615465e8 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -46,8 +46,8 @@
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toStartOf="@+id/joinSuggestedRoomButton"
@@ -65,8 +65,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomNameView"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 6be8bc0ede..12a63594a8 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -36,8 +36,8 @@
         android:layout_toEndOf="@+id/messageStartGuideline"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         tools:text="@sample/users.json/data/displayName" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index db2884741f..810620fec4 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -22,8 +22,8 @@
         android:layout_marginTop="4dp"
         android:drawablePadding="6dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         tools:text="@sample/users.json/data/displayName" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 38b03c4159..c05c0c2a72 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -21,8 +21,8 @@
         android:background="?android:colorBackground"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_tertiary"
-        android:textSize="15sp"
         tools:text="@tools:sample/date/day_of_week" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 437cb2f4bd..61bb2c68d9 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -81,8 +81,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/roomNameTileText"
@@ -93,9 +93,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
+            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             android:textColorLink="?colorPrimary"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/roomNameDescriptionText"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 06bcd02351..a4fb8195a2 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -28,8 +28,8 @@
             android:drawablePadding="2dp"
             android:gravity="start"
             android:text="@string/notice_crypto_unable_to_decrypt_merged"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_secondary"
-            android:textSize="15sp"
             app:drawableStartCompat="@drawable/ic_clock"
             app:drawableTint="?vctr_content_secondary" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index 9b2927adb1..a1ded81e2f 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -13,8 +13,8 @@
         android:layout_gravity="center_horizontal"
         android:drawablePadding="6dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         tools:drawableStart="@drawable/ic_shield_trusted"
         tools:text="@string/sas_verified" />
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index c95bb5ff84..ae2869a765 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -14,8 +14,8 @@
         android:layout_gravity="center_horizontal"
         android:drawablePadding="6dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_shield_black"
         tools:text="@string/verification_request" />
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 6732e6d121..5754bf2fc3 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -13,8 +13,8 @@
         android:layout_height="wrap_content"
         android:drawablePadding="6dp"
         android:gravity="center"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:drawableTint="?vctr_content_primary"
         tools:drawableStart="@drawable/ic_video"
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index 5ce388c90b..3ef212edc0 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -21,7 +21,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:text="@string/timeline_unread_messages"
-        android:textColor="@color/notification_accent_color"
-        android:textSize="15sp" />
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
+        android:textColor="@color/notification_accent_color" />
 
 </FrameLayout>
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index dc71d0694a..408cd4852f 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -31,8 +31,8 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 407ea7f3cb..d65e77b223 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -29,8 +29,8 @@
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemUserName"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,8 +46,8 @@
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
-        android:textSize="15sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index 043736c190..97f0dd5cd4 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -37,7 +37,6 @@
         android:paddingStart="8dp"
         android:paddingEnd="16dp"
         android:text="@string/action_close"
-        android:textSize="15sp"
         android:textStyle="bold" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 38a297a4ad..d413f49f88 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -79,8 +79,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
+            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
-            android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/emptyMessageView"
             app:layout_constraintEnd_toEndOf="parent"

From c1d71a37598153586adada16d19c3b5378c6cf7a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 22:12:26 +0200
Subject: [PATCH 12/49] textSize 13sp -> text appearance

---
 vector/src/main/res/layout/fragment_home_drawer.xml             | 1 -
 .../src/main/res/layout/item_timeline_event_call_tile_stub.xml  | 2 +-
 .../main/res/layout/item_timeline_event_verification_stub.xml   | 2 +-
 vector/src/main/res/layout/reaction_button.xml                  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index c0b3a209a0..cef0f76b2a 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -110,7 +110,6 @@
             android:insetBottom="0dp"
             android:padding="0dp"
             android:text="@string/invite_friends"
-            android:textSize="13sp"
             app:icon="@drawable/ic_share"
             app:iconGravity="textStart"
             app:iconSize="20dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 810620fec4..1415fd64d9 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -52,8 +52,8 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="12dp"
+        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_notice_secondary"
-        android:textSize="13sp"
         tools:text="@string/video_call_in_progress" />
 
 
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index ae2869a765..fac551f312 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -65,8 +65,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:text="@string/verification_request_you_accepted"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_notice_secondary"
-        android:textSize="13sp"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index 72a795db76..2fdab9b50f 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -44,8 +44,8 @@
         android:maxEms="10"
         android:minWidth="20dp"
         android:singleLine="true"
+        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="@color/emoji_color"
-        android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/reactionCount"
         app:layout_constraintHorizontal_chainStyle="packed"

From b5bdd134cbe81b21363860a2e71a5d3b58333c1d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 22:14:05 +0200
Subject: [PATCH 13/49] textSize 10sp ->
 android:textAppearance="@style/VectorTextAppearanceMicro"

---
 vector/src/main/res/layout/fragment_home_detail.xml            | 2 +-
 vector/src/main/res/layout/item_room.xml                       | 2 +-
 vector/src/main/res/layout/item_room_category.xml              | 2 +-
 vector/src/main/res/layout/item_space.xml                      | 2 +-
 vector/src/main/res/layout/item_sub_space.xml                  | 2 +-
 vector/src/main/res/layout/reaction_button.xml                 | 2 +-
 vector/src/main/res/layout/vector_home_badge_unread_layout.xml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 3a65733495..c37bce5c79 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -56,8 +56,8 @@
                         android:minHeight="16dp"
                         android:paddingStart="4dp"
                         android:paddingEnd="4dp"
+                        android:textAppearance="@style/VectorTextAppearanceMicro"
                         android:textColor="?colorOnError"
-                        android:textSize="10sp"
                         android:visibility="gone"
                         tools:background="@drawable/bg_unread_highlight"
                         tools:text="4"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index ba5b3f5671..cd638617a1 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -143,8 +143,8 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
+        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
-        android:textSize="10sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
         app:layout_constraintEnd_toStartOf="@+id/roomLastEventTimeView"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index b24ff770c8..c2142d0208 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -40,8 +40,8 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
+        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
-        android:textSize="10sp"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="24" />
 
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 35cd0086eb..d38051a633 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -44,8 +44,8 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
+        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
-        android:textSize="10sp"
         android:visibility="gone"
         app:layout_constraintCircle="@+id/groupAvatarImageView"
         app:layout_constraintCircleAngle="45"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 2e31f7b854..9a25aa6e45 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -44,8 +44,8 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
+        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
-        android:textSize="10sp"
         android:visibility="gone"
         app:layout_constraintCircle="@+id/groupAvatarImageView"
         app:layout_constraintCircleAngle="45"
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index 2fdab9b50f..bc606521b0 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -61,8 +61,8 @@
         android:layout_marginEnd="8dp"
         android:gravity="center"
         android:maxLines="1"
+        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?vctr_content_secondary"
-        android:textSize="10sp"
         android:textStyle="bold"
         app:autoSizeMaxTextSize="14sp"
         app:autoSizeMinTextSize="8sp"
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index a24f36df3a..1d21f5d7cc 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -17,8 +17,8 @@
         android:minHeight="8dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
+        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
-        android:textSize="10sp"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="4" />
 

From f90ee45d8caabd25e67d9ce13498bcbb0dc54190 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 23:03:37 +0200
Subject: [PATCH 14/49] Use style to take into account `lineHeight`

---
 .../layout/activity_test_material_theme.xml   |  4 +-
 .../res/layout/debug_text_appearance.xml      | 74 -------------------
 .../src/debug/res/layout/debug_text_view.xml  | 68 +++++++++++++++++
 .../src/debug/res/layout/item_sas_emoji.xml   |  6 +-
 .../main/res/layout/activity_bug_report.xml   |  2 +-
 vector/src/main/res/layout/activity_call.xml  |  2 +-
 .../main/res/layout/activity_signed_out.xml   |  4 +-
 .../res/layout/activity_simple_loading.xml    |  1 -
 .../layout/alerter_incoming_call_layout.xml   |  4 +-
 .../layout/alerter_verification_layout.xml    |  6 +-
 .../bottom_sheet_generic_list_with_title.xml  |  2 +-
 .../layout/bottom_sheet_invited_to_space.xml  |  4 +-
 .../layout/bottom_sheet_logout_and_backup.xml |  2 +-
 .../bottom_sheet_room_widget_permission.xml   |  8 +-
 .../res/layout/bottom_sheet_space_invite.xml  |  4 +-
 .../bottom_sheet_space_invite_chooser.xml     |  2 +-
 .../layout/bottom_sheet_space_settings.xml    |  4 +-
 .../res/layout/dialog_disclaimer_content.xml  |  2 +-
 .../main/res/layout/dialog_event_content.xml  |  4 +-
 .../res/layout/dialog_export_e2e_keys.xml     |  2 +-
 .../res/layout/dialog_import_e2e_keys.xml     |  2 +-
 .../layout/dialog_recovery_key_saved_info.xml |  2 +-
 .../layout/fragment_bootstrap_conclusion.xml  |  2 +-
 ...gment_bootstrap_enter_account_password.xml |  2 +-
 .../fragment_bootstrap_enter_passphrase.xml   |  4 +-
 .../fragment_bootstrap_migrate_backup.xml     |  2 +-
 .../res/layout/fragment_bootstrap_reauth.xml  |  4 +-
 .../layout/fragment_bootstrap_save_key.xml    |  4 +-
 .../fragment_bootstrap_setup_recovery.xml     |  4 +-
 .../res/layout/fragment_bootstrap_waiting.xml |  4 +-
 .../res/layout/fragment_contacts_book.xml     |  2 +-
 ...ent_create_direct_room_directory_users.xml |  2 +-
 .../main/res/layout/fragment_create_room.xml  |  2 +-
 .../layout/fragment_devtool_keyrequests.xml   | 18 ++---
 .../main/res/layout/fragment_home_detail.xml  |  4 +-
 .../main/res/layout/fragment_home_drawer.xml  |  8 +-
 .../fragment_keys_backup_restore_from_key.xml |  2 +-
 ...nt_keys_backup_restore_from_passphrase.xml |  2 +-
 .../fragment_keys_backup_restore_success.xml  |  2 +-
 .../fragment_keys_backup_setup_step1.xml      |  2 +-
 .../fragment_keys_backup_setup_step2.xml      |  2 +-
 .../fragment_keys_backup_setup_step3.xml      |  4 +-
 vector/src/main/res/layout/fragment_login.xml |  8 +-
 .../layout/fragment_login_account_created.xml | 16 ++--
 ...fragment_login_generic_text_input_form.xml |  6 +-
 ...agment_login_generic_text_input_form_2.xml |  8 +-
 .../layout/fragment_login_reset_password.xml  |  4 +-
 .../fragment_login_reset_password_2.xml       |  8 +-
 ...login_reset_password_mail_confirmation.xml |  6 +-
 ...gin_reset_password_mail_confirmation_2.xml |  6 +-
 .../fragment_login_reset_password_success.xml |  6 +-
 ...ragment_login_reset_password_success_2.xml |  6 +-
 .../fragment_login_server_selection.xml       | 14 ++--
 .../fragment_login_server_selection_2.xml     | 14 ++--
 .../layout/fragment_login_server_url_form.xml | 10 +--
 .../fragment_login_server_url_form_2.xml      |  4 +-
 .../fragment_login_signin_password_2.xml      |  6 +-
 .../layout/fragment_login_signin_to_any_2.xml |  4 +-
 .../fragment_login_signin_username_2.xml      |  6 +-
 .../fragment_login_signup_password_2.xml      | 10 +--
 ...fragment_login_signup_signin_selection.xml |  6 +-
 .../fragment_login_signup_username_2.xml      |  8 +-
 .../main/res/layout/fragment_login_splash.xml |  8 +-
 .../res/layout/fragment_login_splash_2.xml    |  8 +-
 .../res/layout/fragment_login_sso_only_2.xml  |  2 +-
 .../res/layout/fragment_login_terms_2.xml     |  2 +-
 .../layout/fragment_login_wait_for_email.xml  |  4 +-
 .../fragment_login_wait_for_email_2.xml       |  6 +-
 .../res/layout/fragment_matrix_profile.xml    |  2 +-
 .../fragment_matrix_to_room_space_card.xml    |  8 +-
 .../layout/fragment_matrix_to_user_card.xml   |  4 +-
 .../res/layout/fragment_qr_code_scanner.xml   | 44 +++++------
 .../res/layout/fragment_reauth_confirm.xml    |  6 +-
 .../fragment_recyclerview_with_search.xml     |  4 +-
 .../main/res/layout/fragment_room_detail.xml  |  2 +-
 .../fragment_room_preview_no_preview.xml      | 10 +--
 .../layout/fragment_room_setting_generic.xml  |  2 +-
 .../main/res/layout/fragment_room_uploads.xml |  2 +-
 .../layout/fragment_set_identity_server.xml   |  4 +-
 .../res/layout/fragment_space_add_rooms.xml   |  4 +-
 ...ment_space_create_choose_private_model.xml |  2 +-
 .../fragment_space_create_choose_type.xml     |  6 +-
 .../res/layout/fragment_space_preview.xml     |  2 +-
 .../layout/fragment_ssss_access_from_key.xml  |  2 +-
 .../fragment_ssss_access_from_passphrase.xml  |  4 +-
 .../res/layout/fragment_ssss_reset_all.xml    |  4 +-
 .../res/layout/fragment_user_code_show.xml    |  8 +-
 .../res/layout/fragment_user_directory.xml    |  2 +-
 .../main/res/layout/fragment_user_list.xml    |  4 +-
 .../res/layout/item_autocomplete_command.xml  |  6 +-
 .../res/layout/item_autocomplete_emoji.xml    |  4 +-
 .../layout/item_autocomplete_matrix_item.xml  |  4 +-
 .../layout/item_autocomplete_more_result.xml  |  2 +-
 .../item_bottom_sheet_message_preview.xml     |  8 +-
 .../item_bottom_sheet_message_status.xml      |  4 +-
 .../res/layout/item_bottom_sheet_radio.xml    |  4 +-
 .../layout/item_bottom_sheet_room_preview.xml |  2 +-
 .../res/layout/item_bottom_sheet_title.xml    |  4 +-
 .../res/layout/item_completion_homeserver.xml |  2 +-
 .../main/res/layout/item_contact_action.xml   |  2 +-
 .../main/res/layout/item_contact_detail.xml   |  4 +-
 .../src/main/res/layout/item_contact_main.xml |  2 +-
 .../layout/item_create_direct_room_user.xml   |  4 +-
 vector/src/main/res/layout/item_device.xml    |  8 +-
 .../src/main/res/layout/item_emoji_result.xml |  2 +-
 .../res/layout/item_expandable_textview.xml   |  2 +-
 .../res/layout/item_form_advanced_toggle.xml  |  2 +-
 .../src/main/res/layout/item_form_switch.xml  |  4 +-
 .../main/res/layout/item_generic_button.xml   |  8 +-
 .../res/layout/item_generic_empty_state.xml   |  4 +-
 .../main/res/layout/item_generic_header.xml   |  2 +-
 .../res/layout/item_generic_with_value.xml    |  4 +-
 vector/src/main/res/layout/item_group.xml     |  2 +-
 .../src/main/res/layout/item_help_footer.xml  |  2 +-
 .../src/main/res/layout/item_known_user.xml   |  4 +-
 vector/src/main/res/layout/item_loading.xml   |  2 +-
 vector/src/main/res/layout/item_locale.xml    |  2 +-
 .../src/main/res/layout/item_login_text.xml   |  2 +-
 .../src/main/res/layout/item_login_title.xml  |  2 +-
 .../res/layout/item_login_title_small.xml     |  2 +-
 .../layout/item_notification_troubleshoot.xml |  2 +-
 .../main/res/layout/item_profile_action.xml   |  4 +-
 .../res/layout/item_profile_matrix_item.xml   |  6 +-
 .../item_profile_matrix_item_progress.xml     |  4 +-
 .../main/res/layout/item_profile_section.xml  | 10 +--
 .../src/main/res/layout/item_public_room.xml  |  6 +-
 .../src/main/res/layout/item_pushgateway.xml  |  4 +-
 vector/src/main/res/layout/item_room.xml      | 10 +--
 .../res/layout/item_room_alias_text_input.xml |  4 +-
 .../main/res/layout/item_room_category.xml    |  4 +-
 .../main/res/layout/item_room_directory.xml   |  4 +-
 .../res/layout/item_room_directory_server.xml |  4 +-
 .../res/layout/item_room_filter_footer.xml    |  2 +-
 .../main/res/layout/item_room_invitation.xml  |  4 +-
 .../res/layout/item_room_to_add_in_space.xml  |  2 +-
 .../layout/item_room_to_manage_in_space.xml   |  4 +-
 .../main/res/layout/item_search_result.xml    |  4 +-
 .../item_settings_button_single_line.xml      |  2 +-
 .../res/layout/item_settings_edit_text.xml    |  2 +-
 .../res/layout/item_settings_helper_info.xml  |  2 +-
 .../res/layout/item_settings_information.xml  |  2 +-
 .../layout/item_settings_section_title.xml    |  2 +-
 .../res/layout/item_settings_simple_item.xml  |  4 +-
 .../res/layout/item_settings_three_pid.xml    |  2 +-
 .../res/layout/item_simple_reaction_info.xml  |  2 +-
 vector/src/main/res/layout/item_space.xml     |  6 +-
 vector/src/main/res/layout/item_space_add.xml |  2 +-
 .../res/layout/item_space_beta_header.xml     |  6 +-
 .../main/res/layout/item_space_roomchild.xml  |  4 +-
 .../main/res/layout/item_space_subspace.xml   |  2 +-
 .../res/layout/item_space_top_summary.xml     |  2 +-
 vector/src/main/res/layout/item_sub_space.xml |  4 +-
 .../main/res/layout/item_suggested_room.xml   |  4 +-
 .../res/layout/item_timeline_event_base.xml   |  4 +-
 .../item_timeline_event_base_noinfo.xml       |  2 +-
 .../item_timeline_event_call_tile_stub.xml    |  6 +-
 .../item_timeline_event_code_block_stub.xml   |  4 +-
 .../res/layout/item_timeline_event_create.xml |  4 +-
 .../item_timeline_event_day_separator.xml     |  2 +-
 .../item_timeline_event_default_stub.xml      |  2 +-
 ...item_timeline_event_merged_header_stub.xml |  4 +-
 ...meline_event_merged_room_creation_stub.xml |  8 +-
 .../item_timeline_event_merged_utd_stub.xml   |  6 +-
 .../item_timeline_event_notice_stub.xml       |  2 +-
 ...tem_timeline_event_option_buttons_stub.xml |  2 +-
 .../layout/item_timeline_event_poll_stub.xml  |  4 +-
 .../item_timeline_event_redacted_stub.xml     |  2 +-
 .../item_timeline_event_status_tile_stub.xml  |  4 +-
 .../item_timeline_event_text_message_stub.xml |  2 +-
 .../item_timeline_event_verification_stub.xml |  6 +-
 .../item_timeline_event_widget_stub.xml       |  2 +-
 .../res/layout/item_timeline_read_marker.xml  |  2 +-
 .../src/main/res/layout/item_unknown_room.xml |  2 +-
 .../src/main/res/layout/item_uploads_file.xml |  4 +-
 vector/src/main/res/layout/item_user.xml      |  4 +-
 .../res/layout/item_verification_action.xml   |  4 +-
 .../res/layout/item_verification_notice.xml   |  2 +-
 .../res/layout/item_verification_wait.xml     |  2 +-
 .../res/layout/item_verification_waiting.xml  |  2 +-
 .../media_upload_download_progress_layout.xml |  2 +-
 .../layout/merge_image_attachment_overlay.xml |  4 +-
 .../src/main/res/layout/reaction_button.xml   |  4 +-
 .../vector_home_badge_unread_layout.xml       |  2 +-
 .../main/res/layout/vector_invite_view.xml    |  6 +-
 .../view_bottom_sheet_action_button.xml       |  4 +-
 .../main/res/layout/view_current_calls.xml    |  4 +-
 .../layout/view_failed_messages_warning.xml   |  4 +-
 .../res/layout/view_keys_backup_banner.xml    |  4 +-
 .../main/res/layout/view_poll_result_line.xml |  4 +-
 .../src/main/res/layout/view_read_marker.xml  |  2 +-
 .../main/res/layout/view_read_receipts.xml    |  2 +-
 .../res/layout/view_room_widgets_banner.xml   |  2 +-
 .../res/layout/view_space_type_button.xml     |  4 +-
 vector/src/main/res/layout/view_state.xml     |  6 +-
 .../view_stub_room_member_profile_header.xml  |  6 +-
 .../layout/view_stub_room_profile_header.xml  |  2 +-
 .../src/main/res/layout/view_url_preview.xml  |  6 +-
 vector/src/main/res/values/styles_buttons.xml |  8 ++
 .../src/main/res/values/styles_text_view.xml  | 41 +++++++++-
 .../src/main/res/values/text_appearances.xml  |  7 +-
 vector/src/main/res/values/theme_dark.xml     |  2 +-
 vector/src/main/res/values/theme_light.xml    |  2 +-
 202 files changed, 542 insertions(+), 503 deletions(-)
 delete mode 100644 vector/src/debug/res/layout/debug_text_appearance.xml
 create mode 100644 vector/src/debug/res/layout/debug_text_view.xml

diff --git a/vector/src/debug/res/layout/activity_test_material_theme.xml b/vector/src/debug/res/layout/activity_test_material_theme.xml
index 07b54ec0dd..c228377b98 100644
--- a/vector/src/debug/res/layout/activity_test_material_theme.xml
+++ b/vector/src/debug/res/layout/activity_test_material_theme.xml
@@ -444,10 +444,10 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Text appearance" />
+                    android:text="Text views" />
 
                 <include
-                    layout="@layout/debug_text_appearance"
+                    layout="@layout/debug_text_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
diff --git a/vector/src/debug/res/layout/debug_text_appearance.xml b/vector/src/debug/res/layout/debug_text_appearance.xml
deleted file mode 100644
index 39db326618..0000000000
--- a/vector/src/debug/res/layout/debug_text_appearance.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:ignore="HardcodedText">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceTitle"
-        android:textAppearance="@style/VectorTextAppearanceTitle" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceTitle.M"
-        android:textAppearance="@style/VectorTextAppearanceTitle.M" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceHeadlineM"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceSubtitle"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceSubtitle.M"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceBody\nVectorTextAppearanceBody"
-        android:textAppearance="@style/VectorTextAppearanceBody" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceBody.M"
-        android:textAppearance="@style/VectorTextAppearanceBody.M" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceButton"
-        android:textAppearance="@style/VectorTextAppearanceButton" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceCaption"
-        android:textAppearance="@style/VectorTextAppearanceCaption" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceMicro"
-        android:textAppearance="@style/VectorTextAppearanceMicro" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Default (VectorTextAppearanceBody)" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/debug/res/layout/debug_text_view.xml b/vector/src/debug/res/layout/debug_text_view.xml
new file mode 100644
index 0000000000..7e922fe741
--- /dev/null
+++ b/vector/src/debug/res/layout/debug_text_view.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="HardcodedText">
+
+    <TextView
+        style="@style/VectorTextView.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceTitle\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.Title.M"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceTitle.M\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.HeadlineM"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceHeadlineM\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceSubtitle\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.Subtitle.M"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceSubtitle.M\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.Body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceBody\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.Body.M"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceBody.M\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceCaption\nline 2" />
+
+    <TextView
+        style="@style/VectorTextView.Micro"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="VectorTextAppearanceMicro\nline 2" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Default (VectorTextAppearanceBody)\nline 2" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index be68af6021..94e0689b1f 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -12,11 +12,11 @@
 
     <TextView
         android:id="@+id/sas_emoji_index"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="32dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         tools:text="63:" />
 
@@ -36,19 +36,19 @@
 
         <TextView
             android:id="@+id/sas_emoji_text"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             tools:text="@string/verification_emoji_spanner" />
 
         <TextView
             android:id="@+id/sas_emoji_text_id"
+            style="@style/VectorTextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             tools:text="verification_emoji_spanner" />
 
     </LinearLayout>
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 4736ec667e..840a3439d9 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -91,12 +91,12 @@
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     android:text="@string/send_bug_report_description_in_english"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary" />
 
                 <TextView
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 9280784f93..c8d1a34446 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -114,6 +114,7 @@
 
     <TextView
         android:id="@+id/callStatusText"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -121,7 +122,6 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml
index d3c291b23f..1f50dd55a2 100644
--- a/vector/src/main/res/layout/activity_signed_out.xml
+++ b/vector/src/main/res/layout/activity_signed_out.xml
@@ -17,19 +17,19 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/signed_out_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/signed_out_notice"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <Button
diff --git a/vector/src/main/res/layout/activity_simple_loading.xml b/vector/src/main/res/layout/activity_simple_loading.xml
index b523d97c92..ac0e64a5b5 100644
--- a/vector/src/main/res/layout/activity_simple_loading.xml
+++ b/vector/src/main/res/layout/activity_simple_loading.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index 820e9de797..e0fae2741b 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -22,13 +22,13 @@
 
     <TextView
         android:id="@+id/incomingCallNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
@@ -38,6 +38,7 @@
 
     <TextView
         android:id="@+id/incomingCallKindView"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
@@ -45,7 +46,6 @@
         android:drawablePadding="4dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:drawableTint="?vctr_content_secondary"
         app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 3fb677540e..2b484dc4ee 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -44,19 +44,21 @@
 
         <TextView
             android:id="@+id/tvTitle"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
             android:layout_marginEnd="@dimen/alerter_padding_half"
             android:paddingStart="@dimen/alerter_padding_small"
             android:paddingEnd="@dimen/alerter_padding_small"
-            android:textAppearance="@style/AlertTextAppearance.Title"
+            android:textColor="@android:color/white"
             android:visibility="gone"
             tools:text="Title"
             tools:visibility="visible" />
 
         <TextView
             android:id="@+id/tvText"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
@@ -66,7 +68,7 @@
             android:paddingTop="@dimen/alerter_padding_small"
             android:paddingEnd="@dimen/alerter_padding_small"
             android:paddingBottom="@dimen/alerter_padding_small"
-            android:textAppearance="@style/AlertTextAppearance.Text"
+            android:textColor="@android:color/white"
             android:visibility="gone"
             tools:text="Text"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
index 6529117c51..89c253e6bc 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
@@ -9,11 +9,11 @@
 
     <TextView
         android:id="@+id/bottomSheetTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:padding="8dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         tools:text="@string/reactions" />
 
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index dffdfaf1ec..f523303aba 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -17,9 +17,9 @@
         android:orientation="vertical">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:padding="16dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="16dp">
 
             <ImageView
                 android:id="@+id/inviterAvatarImage"
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index c45dd60b91..b9d1deb318 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -11,13 +11,13 @@
     android:paddingBottom="8dp">
 
     <TextView
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:text="@string/action_sign_out"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold" />
 
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 6d9f17abdd..dd6009c655 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -23,13 +23,13 @@
 
     <TextView
         android:id="@+id/widgetPermissionHeader2"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:text="@string/room_widget_permission_added_by"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary" />
 
     <LinearLayout
@@ -57,20 +57,20 @@
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerDisplayName"
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary"
                 android:textStyle="bold"
                 tools:text="@sample/users.json/data/displayName" />
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerId"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@sample/users.json/data/id" />
 
@@ -80,13 +80,13 @@
 
     <TextView
         android:id="@+id/widgetPermissionSharedInfo"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginTop="@dimen/layout_vertical_margin_big"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         tools:text="@string/room_widget_permission_shared_info_title" />
 
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index 5344841f71..e0b6dfc531 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -10,24 +10,24 @@
 
     <TextView
         android:id="@+id/headerText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="12dp"
         android:gravity="center"
         android:text="@string/invite_people_to_your_space"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/descriptionText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
         app:layout_constraintTop_toBottomOf="@id/headerText"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index a86adca3c7..0b1cf98d49 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -9,13 +9,13 @@
 
     <TextView
         android:id="@+id/headerText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:text="@string/invite_people_menu"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 40c7bca33a..5559c8dc8b 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -27,13 +27,13 @@
 
         <TextView
             android:id="@+id/spaceNameView"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:duplicateParentState="true"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             app:layout_constrainedWidth="true"
@@ -56,6 +56,7 @@
 
         <TextView
             android:id="@+id/spaceDescription"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -63,7 +64,6 @@
             android:layout_marginEnd="8dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index 33d1e493cd..e3cd296fa5 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -52,6 +52,7 @@
         app:layout_constraintTop_toBottomOf="@id/disclaimerIconsLayout" />
 
     <TextView
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
@@ -60,7 +61,6 @@
         android:gravity="center"
         android:paddingBottom="32dp"
         android:text="@string/disclaimer_content"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
index c779d37bfc..7ae0acf8f7 100644
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ b/vector/src/main/res/layout/dialog_event_content.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:textSize="12sp"
         android:fontFamily="monospace"
-        android:textIsSelectable="true" />
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
 </ScrollView>
\ No newline at end of file
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 8b9454c7c9..a9388b1860 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -12,10 +12,10 @@
 
     <TextView
         android:id="@+id/exportDialogText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/encryption_export_notice"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintTop_toTopOf="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 cf202b00f8..aeb6398097 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -12,11 +12,11 @@
 
     <TextView
         android:id="@+id/dialog_e2e_keys_passphrase_filename"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index e45e44d769..8bd855fc77 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -48,9 +48,9 @@
 
         <TextView
             android:id="@+id/keepItSafeText"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_secondary"
             tools:text="@string/bootstrap_crosssigning_save_usb" />
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
index 129bb294b8..9c4e2b3bdf 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
@@ -11,13 +11,13 @@
 
     <TextView
         android:id="@+id/bootstrapConclusionText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="@string/bootstrap_cross_signing_success"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index 94e38e75d9..2cc70d8edb 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -9,10 +9,10 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@id/bootstrapAccountPasswordTil"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 7187073061..d80c612b47 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -8,11 +8,11 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/bootstrap_info_text_2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@id/ssss_passphrase_enter_til"
         app:layout_constraintTop_toTopOf="parent" />
@@ -48,6 +48,7 @@
 
         <TextView
             android:id="@+id/bootstrapWarningInfo"
+            style="@style/VectorTextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -55,7 +56,6 @@
             android:drawablePadding="4dp"
             android:gravity="center_vertical"
             android:text="@string/bootstrap_dont_reuse_pwd"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_primary"
             app:drawableStartCompat="@drawable/ic_alert_triangle"
             app:drawableTint="?colorError" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index eea1738669..c446347ae8 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -9,10 +9,10 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@id/bootstrapRecoveryKeyEnterTil"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index 9cb08b27e3..d8e04fba57 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -9,10 +9,10 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@id/waitingProgress"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,10 +28,10 @@
 
     <TextView
         android:id="@+id/reAuthFailureText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorError"
         app:layout_constraintBottom_toTopOf="@id/buttonFlow"
         app:layout_constraintTop_toBottomOf="@id/waitingProgress"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index ae270b8f83..f0661eec8d 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -10,17 +10,18 @@
 
     <TextView
         android:id="@+id/bootstrapSaveText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="@string/bottom_sheet_save_your_recovery_key_content"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary" />
 
     <TextView
         android:id="@+id/bootstrapRecoveryKeyText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -28,7 +29,6 @@
         android:fontFamily="monospace"
         android:gravity="center_horizontal"
         android:padding="4dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_notice_secondary"
         tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 1945b9bbf2..69a79ab59c 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -10,13 +10,13 @@
 
     <TextView
         android:id="@+id/bootstrapSetupSecureText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:text="@string/bottom_sheet_setup_secure_backup_subtitle"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary" />
 
     <View
@@ -75,6 +75,7 @@
 
     <TextView
         android:id="@+id/bootstrapSetupWarningTextView"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -83,7 +84,6 @@
         android:layout_marginBottom="16dp"
         android:drawablePadding="4dp"
         android:text="@string/reset_secure_backup_warning"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorError"
         app:drawableStartCompat="@drawable/ic_warning_badge" />
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index 979ee26105..fe4a99c6c6 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -10,11 +10,11 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/bootstrap_loading_text"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -28,11 +28,11 @@
 
     <TextView
         android:id="@+id/bootstrapLoadingStatusText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:layout_constraintTop_toBottomOf="@id/bootstrapWaitingProgress"
         tools:text="Bending the spoon..." />
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index 5fcd1f3063..9c9f92a74c 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -41,6 +41,7 @@
 
                     <TextView
                         android:id="@+id/phoneBookTitle"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -48,7 +49,6 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/contacts_book_title"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 7cd03ba010..0c93e7d755 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -41,6 +41,7 @@
 
                     <TextView
                         android:id="@+id/createDirectRoomTitle"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -48,7 +49,6 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/direct_chats_header"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index 04d82c2a22..cd455a9b0d 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -38,6 +38,7 @@
 
                     <TextView
                         android:id="@+id/createRoomTitle"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -45,7 +46,6 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/create_room_title"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_devtool_keyrequests.xml b/vector/src/main/res/layout/fragment_devtool_keyrequests.xml
index dd0cbff1b1..67fcfebfa1 100644
--- a/vector/src/main/res/layout/fragment_devtool_keyrequests.xml
+++ b/vector/src/main/res/layout/fragment_devtool_keyrequests.xml
@@ -15,20 +15,20 @@
         app:tabMode="scrollable" />
 
     <androidx.viewpager2.widget.ViewPager2
-        app:layout_constraintTop_toBottomOf="@id/devToolKeyRequestTabs"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:id="@+id/devToolKeyRequestPager"
         android:layout_width="match_parent"
-        android:layout_height="0dp" />
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/devToolKeyRequestTabs" />
 
     <ProgressBar
         android:id="@+id/exportWaitingView"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="40dp"
-        android:layout_height="40dp"/>
+        android:layout_height="40dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index c37bce5c79..ccdfbe698c 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -46,6 +46,7 @@
 
                     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
                         android:id="@+id/drawerUnreadCounterBadgeView"
+                        style="@style/VectorTextView.Micro"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
@@ -56,7 +57,6 @@
                         android:minHeight="16dp"
                         android:paddingStart="4dp"
                         android:paddingEnd="4dp"
-                        android:textAppearance="@style/VectorTextAppearanceMicro"
                         android:textColor="?colorOnError"
                         android:visibility="gone"
                         tools:background="@drawable/bg_unread_highlight"
@@ -89,12 +89,12 @@
 
                     <TextView
                         android:id="@+id/groupToolbarSpaceTitleView"
+                        style="@style/VectorTextView.Body"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:gravity="start"
                         android:maxLines="1"
-                        android:textAppearance="@style/VectorTextAppearanceBody"
                         android:textColor="?vctr_content_primary"
                         android:visibility="gone"
                         tools:text="@tools:sample/lorem/random"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index cef0f76b2a..d86db0949a 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -44,13 +44,13 @@
 
         <TextView
             android:id="@+id/homeDrawerUsernameView"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="8dp"
             android:maxLines="1"
             android:singleLine="true"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
@@ -59,12 +59,12 @@
 
         <TextView
             android:id="@+id/homeDrawerUserIdView"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:maxLines="1"
             android:singleLine="true"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@+id/homeDrawerInviteFriendButton"
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
@@ -140,6 +140,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSettingsView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
@@ -149,7 +150,6 @@
         android:minHeight="52dp"
         android:padding="16dp"
         android:text="@string/settings"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:tint="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_settings_18dp"
         app:drawableTint="?vctr_content_secondary"
@@ -158,6 +158,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSignoutView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
@@ -167,7 +168,6 @@
         android:minHeight="52dp"
         android:padding="16dp"
         android:text="@string/logout"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:tint="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_signout_18dp"
         app:drawableTint="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index eb4385e275..d834c81945 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -26,12 +26,12 @@
 
         <TextView
             android:id="@+id/keys_restore_with_key"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
             android:text="@string/keys_backup_restore_with_recovery_key"
             android:textAlignment="center"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index a0be7cfa23..26b3607568 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -26,12 +26,12 @@
 
         <TextView
             android:id="@+id/keys_backup_restore_with_passphrase"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
             android:text="@string/keys_backup_restore_with_passphrase"
             android:textAlignment="center"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index cd375f3d8f..5f1ddb7b61 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -35,11 +35,11 @@
 
     <TextView
         android:id="@+id/success_details_text"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:textAlignment="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index b08690bdcf..b10fca99f4 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -25,12 +25,12 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_title"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:text="@string/keys_backup_setup_step1_title"
         android:textAlignment="center"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_description"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 9606096e0f..530af43aa5 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -32,6 +32,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_description"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -40,7 +41,6 @@
             android:layout_marginBottom="16dp"
             android:text="@string/keys_backup_setup_step2_text_description"
             android:textAlignment="center"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index f7c1fb8a0e..10bb4d2788 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -43,6 +43,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_line1_text"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -50,18 +51,17 @@
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:text="@string/keys_backup_setup_step3_text_line1"
             android:textAlignment="center"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary" />
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_label2"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:textAlignment="center"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             tools:text="@string/keys_backup_setup_step3_text_line2" />
 
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 8ea84e3185..4b801f7a4d 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -26,20 +26,20 @@
 
             <TextView
                 android:id="@+id/loginTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_signin_to" />
 
             <TextView
                 android:id="@+id/loginNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_matrix_org_text" />
 
@@ -101,11 +101,11 @@
 
             <TextView
                 android:id="@+id/loginPasswordNotice"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
                 android:text="@string/login_signin_matrix_id_password_notice"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:visibility="visible" />
@@ -147,12 +147,12 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 90075330f6..cb6f2fb95b 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -16,36 +16,36 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginAccountCreatedSubtitle"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_account_created_subtitle" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_account_created_notice"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_notice_2"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -67,6 +67,7 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedMemberName"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -74,7 +75,6 @@
                     android:layout_marginEnd="4dp"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@+id/loginAccountCreatedTime"
@@ -84,22 +84,22 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedTime"
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintBaseline_toBaselineOf="@+id/loginAccountCreatedMemberName"
                     app:layout_constraintEnd_toEndOf="parent"
                     tools:text="@tools:sample/date/hhmm" />
 
                 <TextView
+                    style="@style/VectorTextView.Body"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/login_account_created_message"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@+id/loginAccountCreatedMemberName"
@@ -108,11 +108,11 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_account_created_instruction"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <FrameLayout
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index 67f7e1f9c6..d2ffd1932e 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -17,29 +17,29 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_set_email_title" />
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:layout_marginBottom="26dp"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_set_email_notice" />
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_msisdn_notice2"
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
index 264f68685c..6011c41845 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
@@ -17,31 +17,31 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_set_email_title_2" />
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:layout_marginBottom="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_set_email_notice_2" />
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormMandatoryNotice"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="26dp"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_email_mandatory_notice_2"
@@ -49,10 +49,10 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
                 tools:text="@string/login_set_msisdn_notice2"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index c9c2ba2d2d..bcace7017e 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -16,20 +16,20 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
                 android:id="@+id/loginNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_reset_password_notice"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
index 03d27b1f2d..d6ef48caf3 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
@@ -16,20 +16,20 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_enter_your_email"
-                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -51,21 +51,21 @@
 
             <TextView
                 android:id="@+id/loginNotice"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:gravity="start"
                 android:text="@string/login_reset_password_notice"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="16dp"
                 android:text="@string/login_choose_a_new_password"
-                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary" />
 
             <FrameLayout
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
index 42b8258d99..aa4e9d3ab7 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
@@ -14,27 +14,27 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary" />
 
             <Button
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
index f7ee600faf..fb1c992db0 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
@@ -14,28 +14,28 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_mail_confirmation_notice_2"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary" />
 
             <Button
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success.xml b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
index 28c11e774e..3d78f3fb81 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
@@ -14,27 +14,27 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_success_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice_2"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary" />
 
             <Button
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
index 5a727de099..41941654f2 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
@@ -14,28 +14,28 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice"
-                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_reset_password_success_notice_2"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <Button
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 2d2a996f71..8407df7e1c 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -19,11 +19,11 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
                 android:text="@string/login_server_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 android:transitionName="loginTitleTransition"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -32,12 +32,12 @@
 
             <TextView
                 android:id="@+id/loginServerText"
+                style="@style/VectorTextView.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_server_text"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -73,12 +73,12 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:gravity="start"
                     android:text="@string/login_server_matrix_org_text"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -116,12 +116,12 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsText"
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
                     android:gravity="start"
                     android:text="@string/login_server_modular_text"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
@@ -130,11 +130,11 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsLearnMore"
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
                     android:text="@string/login_server_modular_learn_more"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?colorPrimary"
                     app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -158,11 +158,11 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_server_other_title"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
                     app:layout_constraintStart_toStartOf="parent"
@@ -171,12 +171,12 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_server_other_text"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index e1f660834f..c84ad5ea2f 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -16,22 +16,22 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_server"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:ignore="UnknownId" />
 
             <TextView
                 android:id="@+id/loginServerText"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/login_server_text"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
@@ -61,12 +61,12 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:gravity="start"
                     android:text="@string/login_server_matrix_org_text"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -77,11 +77,11 @@
 
             <TextView
                 android:id="@+id/loginServerText2"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:text="@string/login_if_you_re_not_sure_select_this_option"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
@@ -98,11 +98,11 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_element_matrix_server_and_others"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
                     app:layout_constraintStart_toStartOf="parent"
@@ -111,12 +111,12 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
+                    style="@style/VectorTextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_server_other_text"
-                    android:textAppearance="@style/VectorTextAppearanceCaption"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -127,13 +127,13 @@
 
             <TextView
                 android:id="@+id/loginServerChoiceEmsLearnMore"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
                 android:paddingTop="16dp"
                 android:paddingBottom="16dp"
                 android:text="@string/login_server_modular_learn_more_about_ems"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index 045e20a1de..d798741e66 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -27,30 +27,30 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_connect_to_modular" />
 
             <TextView
                 android:id="@+id/loginServerUrlFormText"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_url_form_modular_text" />
 
             <TextView
                 android:id="@+id/loginServerUrlFormLearnMore"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:text="@string/login_server_modular_learn_more"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?colorPrimary" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -75,22 +75,22 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:text="@string/login_clear_homeserver_history"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?colorPrimary"
                 android:visibility="invisible"
                 tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/loginServerUrlFormNotice"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_server_url_form_common_notice" />
 
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
index fe108fa4aa..e99ec4223a 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -17,11 +17,11 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_server_url_form_common_notice"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -46,6 +46,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -53,7 +54,6 @@
                 android:paddingEnd="0dp"
                 android:paddingBottom="16dp"
                 android:text="@string/login_clear_homeserver_history"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?colorPrimary"
                 android:visibility="invisible"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
index 8862556fd3..73846d47cf 100644
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
@@ -16,11 +16,11 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_password"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <ImageView
@@ -34,20 +34,20 @@
 
             <TextView
                 android:id="@+id/loginWelcomeBack"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="Welcome back user!" />
 
             <TextView
                 android:id="@+id/loginWelcomeBackWarning"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_unknown_user_warning"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="@color/vector_warning_color_2"
                 android:visibility="gone"
                 tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
index 2947db75b8..c0fc136b17 100644
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -17,10 +17,10 @@
 
             <TextView
                 android:id="@+id/loginTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_signin_to" />
 
@@ -119,12 +119,12 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
index 351fcafd8c..83adbbf34b 100644
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
@@ -17,20 +17,20 @@
 
             <TextView
                 android:id="@+id/loginTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_matrix_identifier"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginSubtitle"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_enter_your_matrix_identifier_help"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <com.google.android.material.textfield.TextInputLayout
@@ -61,12 +61,12 @@
 
             <TextView
                 android:id="@+id/loginServerText3"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:gravity="start"
                 android:text="@string/login_enter_identifier_help"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary" />
 
             <Button
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
index f41ac24b51..8f863a088f 100644
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
@@ -16,46 +16,46 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_password"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:text="@string/login_your_matrix_identifier"
-                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginMatrixIdentifier"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="\@user:domain.org" />
 
             <TextView
+                style="@style/VectorTextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/login_press_back_to_change"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
             <TextView
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_choose_a_password"
-                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary" />
 
             <FrameLayout
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index a916dff0f4..0ff3016514 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -33,10 +33,10 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
@@ -45,11 +45,11 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninText"
+                style="@style/VectorTextView.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -99,12 +99,12 @@
 
                 <TextView
                     android:id="@+id/loginSignupSigninSocialLoginHeader"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="27dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
index 826fe5c918..2996647522 100644
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -17,19 +17,19 @@
 
             <TextView
                 android:id="@+id/loginTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_please_choose_a_user_name"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginSubtitle"
+                style="@style/VectorTextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_signup_to" />
 
@@ -52,10 +52,10 @@
 
             <TextView
                 android:id="@+id/loginChooseHelp"
+                style="@style/VectorTextView.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/login_please_choose_a_user_name_help_2"
-                android:textAppearance="@style/VectorTextAppearanceCaption"
                 android:textColor="?vctr_content_secondary"
                 android:textStyle="italic" />
 
@@ -82,12 +82,12 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:gravity="center"
                     android:text="@string/login_social_continue"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary" />
 
                 <im.vector.app.features.login.SocialLoginButtonsView
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 38144f0206..23102b76ee 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -62,11 +62,11 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
+        style="@style/VectorTextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/login_splash_title"
-        android:textAppearance="@style/VectorTextAppearanceTitle"
         android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
         app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
@@ -105,12 +105,12 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:gravity="start"
             android:text="@string/login_splash_text1"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
@@ -130,12 +130,12 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text2"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
@@ -155,12 +155,12 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text3"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
index 9c6686b140..17cf595e0d 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -62,11 +62,11 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
+        style="@style/VectorTextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/login_splash_title"
-        android:textAppearance="@style/VectorTextAppearanceTitle"
         android:textColor="?vctr_content_primary"
         android:transitionName="loginTitleTransition"
         app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace25"
@@ -105,12 +105,12 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:gravity="start"
             android:text="@string/login_splash_text1"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
@@ -130,12 +130,12 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text2"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
@@ -155,12 +155,12 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text3"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
index d41b834ed3..694c17afd6 100644
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
@@ -15,10 +15,10 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary"
                 tools:ignore="UnknownId"
                 tools:text="@string/login_connect_to" />
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index 00c73d38ed..051a4f18bf 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -21,13 +21,13 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
+            style="@style/VectorTextView.Title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="36dp"
             android:layout_marginTop="52dp"
             android:layout_marginEnd="36dp"
             android:text="@string/login_terms_title"
-            android:textAppearance="@style/VectorTextAppearanceTitle"
             android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email.xml b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
index ae1be34abc..a68182bdcb 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
@@ -16,19 +16,19 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_wait_for_email_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary"
                 tools:text="@string/login_wait_for_email_notice" />
 
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index bb209d0175..874423fb01 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -15,31 +15,31 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
+                style="@style/VectorTextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:text="@string/login_wait_for_email_title"
-                android:textAppearance="@style/VectorTextAppearanceTitle"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
-                android:textAppearance="@style/VectorTextAppearanceSubtitle"
                 android:textColor="?vctr_content_primary"
                 tools:text="@string/login_wait_for_email_notice_2" />
 
             <TextView
                 android:id="@+id/loginWaitForEmailHelp"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:gravity="start"
                 android:text="@string/login_wait_for_email_help"
-                android:textAppearance="@style/VectorTextAppearanceBody"
                 android:textColor="?vctr_content_secondary" />
 
             <ProgressBar
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index be564f96c0..dc663b7bff 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -72,6 +72,7 @@
 
                     <TextView
                         android:id="@+id/matrixProfileToolbarTitleView"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -79,7 +80,6 @@
                         android:alpha="0"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 6d80ae8489..05141795c3 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -42,13 +42,13 @@
 
         <TextView
             android:id="@+id/matrixToCardNameText"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin"
             android:maxLines="1"
             android:singleLine="true"
             android:textAlignment="textStart"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
@@ -56,13 +56,13 @@
 
         <TextView
             android:id="@+id/matrixToCardAliasText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:maxLines="1"
             android:singleLine="true"
             android:textAlignment="textStart"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
@@ -141,13 +141,13 @@
 
         <TextView
             android:id="@+id/matrixToCardDescText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:autoLink="web"
             android:maxLines="4"
             android:textAlignment="textStart"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
             tools:text="@sample/rooms.json/data/topic" />
@@ -211,10 +211,10 @@
         <!-- layout_goneMarginStart: add half the width of the avatar: 15dp -->
         <TextView
             android:id="@+id/peopleYouMayKnowText"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="@id/knownMember1"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 3d5b5a600e..4c98f26ec3 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -21,6 +21,7 @@
 
     <TextView
         android:id="@+id/matrixToCardNameText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -29,13 +30,13 @@
         android:maxLines="1"
         android:singleLine="true"
         android:textAlignment="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
         tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixToCardUserIdText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -44,7 +45,6 @@
         android:maxLines="1"
         android:singleLine="true"
         android:textAlignment="center"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
         tools:text="@sample/users.json/data/id" />
diff --git a/vector/src/main/res/layout/fragment_qr_code_scanner.xml b/vector/src/main/res/layout/fragment_qr_code_scanner.xml
index b57d945aa3..78003e7032 100644
--- a/vector/src/main/res/layout/fragment_qr_code_scanner.xml
+++ b/vector/src/main/res/layout/fragment_qr_code_scanner.xml
@@ -16,27 +16,27 @@
     <!-- TODO In the future we could add a toggle to switch the flash, and other possible settings -->
 
     <!-- TODO add take from album option.. -->
-<!--    <Button-->
-<!--        android:id="@+id/openAlbumButton"-->
-<!--        style="@style/Widget.MaterialComponents.Button.Icon"-->
-<!--        android:layout_width="34dp"-->
-<!--        android:layout_height="34dp"-->
-<!--        android:layout_marginEnd="@dimen/layout_horizontal_margin"-->
-<!--        android:layout_marginBottom="@dimen/layout_vertical_margin_big"-->
-<!--        android:backgroundTint="?vctr_bottom_nav_background_color"-->
-<!--        android:elevation="0dp"-->
-<!--        android:insetLeft="0dp"-->
-<!--        android:insetTop="0dp"-->
-<!--        android:insetRight="0dp"-->
-<!--        android:insetBottom="0dp"-->
-<!--        android:padding="0dp"-->
-<!--        app:cornerRadius="17dp"-->
-<!--        app:icon="@drawable/ic_picture_icon"-->
-<!--        app:iconGravity="textStart"-->
-<!--        app:iconPadding="0dp"-->
-<!--        app:iconSize="20dp"-->
-<!--        app:iconTint="?colorPrimary"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintEnd_toEndOf="parent"/>-->
+    <!--    <Button-->
+    <!--        android:id="@+id/openAlbumButton"-->
+    <!--        style="@style/Widget.MaterialComponents.Button.Icon"-->
+    <!--        android:layout_width="34dp"-->
+    <!--        android:layout_height="34dp"-->
+    <!--        android:layout_marginEnd="@dimen/layout_horizontal_margin"-->
+    <!--        android:layout_marginBottom="@dimen/layout_vertical_margin_big"-->
+    <!--        android:backgroundTint="?vctr_bottom_nav_background_color"-->
+    <!--        android:elevation="0dp"-->
+    <!--        android:insetLeft="0dp"-->
+    <!--        android:insetTop="0dp"-->
+    <!--        android:insetRight="0dp"-->
+    <!--        android:insetBottom="0dp"-->
+    <!--        android:padding="0dp"-->
+    <!--        app:cornerRadius="17dp"-->
+    <!--        app:icon="@drawable/ic_picture_icon"-->
+    <!--        app:iconGravity="textStart"-->
+    <!--        app:iconPadding="0dp"-->
+    <!--        app:iconSize="20dp"-->
+    <!--        app:iconTint="?colorPrimary"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintEnd_toEndOf="parent"/>-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index 54f55bc6f4..0eb6ef1775 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -11,13 +11,13 @@
 
         <TextView
             android:id="@+id/reAuthConfirmText"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
             android:text="@string/re_authentication_default_confirm_text"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             app:layout_constraintBottom_toTopOf="@id/reAuthConfirmButton"
             app:layout_constraintTop_toTopOf="parent"
@@ -70,7 +70,7 @@
         <!--            android:layout_height="wrap_content"-->
         <!--            android:gravity="start"-->
         <!--            android:text="@string/login_signin_matrix_id_password_notice"-->
-        <!--            android:textAppearance="@style/VectorTextAppearanceCaption"-->
+        <!--            style="@style/VectorTextView.Caption"-->
         <!--            android:visibility="gone"-->
         <!--            app:layout_constraintEnd_toEndOf="parent"-->
         <!--            app:layout_constraintStart_toStartOf="parent"-->
@@ -79,11 +79,11 @@
 
         <TextView
             android:id="@+id/genericErrorText"
+            style="@style/VectorTextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="start"
             android:text="@string/authentication_error"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?colorError"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index 1abd5086b8..18af0a56ab 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -37,26 +37,26 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
+                    style="@style/VectorTextView.HeadlineM"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:gravity="start|center"
                     android:maxLines="1"
-                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
                     android:textStyle="bold"
                     tools:text="@tools:sample/lorem/random" />
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:gravity="start|center"
                     android:maxLines="1"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_secondary"
                     tools:text="@tools:sample/lorem/random" />
 
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index dcef10e1a4..e4b4e69c05 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -46,13 +46,13 @@
 
                 <TextView
                     android:id="@+id/roomToolbarTitleView"
+                    style="@style/VectorTextView.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 0484ed3a30..d9a241f72e 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -39,13 +39,13 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
                         android:layout_marginEnd="8dp"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -90,43 +90,43 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewName"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="56dp"
                     android:gravity="center"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
                     android:textStyle="bold"
                     tools:text="@sample/rooms.json/data/name" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewTopic"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
                     android:autoLink="web"
                     android:gravity="center"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_secondary"
                     tools:text="@sample/rooms.json/data/topic" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewLabel"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
                     android:gravity="center"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary"
                     tools:text="@string/room_preview_no_preview" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewError"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
                     android:gravity="center"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?colorError"
                     android:visibility="gone"
                     tools:text="Error"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index be03c351f3..1ebf15edb4 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -48,13 +48,13 @@
 
                 <TextView
                     android:id="@+id/roomSettingsToolbarTitleView"
+                    style="@style/VectorTextView.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index dcef1b9c4e..d32622b1de 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -46,13 +46,13 @@
 
                 <TextView
                     android:id="@+id/roomUploadsToolbarTitleView"
+                    style="@style/VectorTextView.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_set_identity_server.xml b/vector/src/main/res/layout/fragment_set_identity_server.xml
index 19c52873e2..596340431a 100644
--- a/vector/src/main/res/layout/fragment_set_identity_server.xml
+++ b/vector/src/main/res/layout/fragment_set_identity_server.xml
@@ -14,9 +14,9 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultNotice"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:visibility="gone"
             tools:text="@string/identity_server_set_default_notice"
@@ -37,9 +37,9 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultAlternative"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             tools:text="@string/identity_server_set_alternative_notice" />
 
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 30313f7f82..b85adce5aa 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -35,6 +35,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
+                    style="@style/VectorTextView.HeadlineM"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -42,19 +43,18 @@
                     android:gravity="start|center"
                     android:maxLines="1"
                     android:text="@string/space_add_existing_rooms"
-                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:gravity="start|center"
                     android:maxLines="1"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_secondary"
                     tools:text="@sample/spaces.json/data/name" />
 
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index 4b7de7cccd..24b15ce737 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -24,11 +24,11 @@
 
         <TextView
             android:id="@+id/accessInfoHelpText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="center"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintTop_toBottomOf="@id/headerText"
             tools:text="@string/create_spaces_make_sure_access" />
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index fa145f364a..2c28a35cf2 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -12,11 +12,11 @@
 
         <TextView
             android:id="@+id/headerText"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/create_spaces_type_header"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -35,12 +35,12 @@
 
         <TextView
             android:id="@+id/joinInfoHelpText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
             android:gravity="center"
             android:text="@string/create_spaces_join_info_help"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/publicButton" />
 
@@ -72,12 +72,12 @@
 
         <TextView
             android:id="@+id/changeLaterText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
             android:gravity="center"
             android:text="@string/create_spaces_you_can_change_later"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index be79ce4341..7ad4b1e8e2 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -53,13 +53,13 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
                         android:layout_marginEnd="8dp"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index 7e37a9a4fb..ecaaad76ba 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -41,10 +41,10 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key_text"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 20bda4aa66..069294d600 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -41,10 +41,10 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase_warning_text"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -98,11 +98,11 @@
 
         <TextView
             android:id="@+id/ssss_passphrase_or"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/or"
-            android:textAppearance="@style/VectorTextAppearanceHeadlineM"
             android:textColor="?vctr_content_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index c45d91199a..7612aaf4bc 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -61,12 +61,12 @@
 
         <TextView
             android:id="@+id/ssss_reset_text3"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:text="@string/secure_backup_reset_if_you_reset_all"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?colorError"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -74,6 +74,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_text4"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -81,7 +82,6 @@
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
             android:text="@string/secure_backup_reset_no_history"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_primary"
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_text3" />
 
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 4b91494241..a3a746bc76 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -37,6 +37,7 @@
 
                     <TextView
                         android:id="@+id/showUserCodeTitle"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -44,7 +45,6 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/add_by_qr_code"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -102,6 +102,7 @@
 
                 <TextView
                     android:id="@+id/showUserCodeCardNameText"
+                    style="@style/VectorTextView.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -109,13 +110,13 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textAlignment="center"
-                    android:textAppearance="@style/VectorTextAppearanceSubtitle"
                     android:textColor="?vctr_content_primary"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="@sample/users.json/data/displayName" />
 
                 <TextView
                     android:id="@+id/showUserCodeCardUserIdText"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -124,7 +125,6 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textAlignment="center"
-                    android:textAppearance="@style/VectorTextAppearanceBody"
                     android:textColor="?vctr_content_secondary"
                     app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
                     tools:text="@sample/users.json/data/id" />
@@ -156,6 +156,7 @@
 
         <TextView
             android:id="@+id/showUserCodeInfoText"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -163,7 +164,6 @@
             android:layout_marginEnd="16dp"
             android:text="@string/user_code_info_text"
             android:textAlignment="center"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintEnd_toEndOf="@id/showUserCodeCard"
             app:layout_constraintStart_toStartOf="@id/showUserCodeCard"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 897fda6d2c..d6323fee47 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -41,6 +41,7 @@
 
                     <TextView
                         android:id="@+id/userDirectoryTitle"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -48,7 +49,6 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/direct_chats_header"
-                        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                         android:textColor="?vctr_content_primary"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index bd41159199..0f5eac1b36 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -36,6 +36,7 @@
 
                 <TextView
                     android:id="@+id/userListTitle"
+                    style="@style/VectorTextView.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -43,7 +44,6 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:text="@string/fab_menu_create_chat"
-                    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
                     android:textColor="?vctr_content_primary"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -109,12 +109,12 @@
 
     <TextView
         android:id="@+id/userListE2EbyDefaultDisabled"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:drawablePadding="8dp"
         android:text="@string/settings_hs_admin_e2e_disabled"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintTop_toBottomOf="@id/userListFilterDivider"
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index 53121fa1e3..6ca2f93561 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -12,37 +12,37 @@
 
     <TextView
         android:id="@+id/commandName"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         tools:text="/invite" />
 
     <TextView
         android:id="@+id/commandParameter"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="5dp"
         android:layout_toEndOf="@+id/commandName"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         android:textStyle="italic"
         tools:text="&lt;user-id&gt;" />
 
     <TextView
         android:id="@+id/commandDescription"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/commandName"
         android:layout_alignParentStart="true"
         android:layout_gravity="center_vertical"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         tools:text="@string/command_description_invite_user" />
 
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index feea2ccd2c..8b4c78cdd9 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -27,24 +27,24 @@
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiName"
+            style="@style/VectorTextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:maxLines="1"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             tools:text="name" />
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiSubname"
+            style="@style/VectorTextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="2dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary"
             android:visibility="gone"
             tools:text="name"
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 0e3839e140..1896ea8b7b 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -25,23 +25,23 @@
 
         <TextView
             android:id="@+id/matrixItemAutocompleteName"
+            style="@style/VectorTextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:maxLines="1"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             tools:text="name" />
 
         <TextView
             android:id="@+id/matrixItemAutocompleteSubname"
+            style="@style/VectorTextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="2dp"
             android:maxLines="1"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary"
             android:visibility="gone"
             tools:text="name"
diff --git a/vector/src/main/res/layout/item_autocomplete_more_result.xml b/vector/src/main/res/layout/item_autocomplete_more_result.xml
index 53806af7b0..6f209c9c32 100644
--- a/vector/src/main/res/layout/item_autocomplete_more_result.xml
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/VectorTextView.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
     android:padding="8dp"
     android:text="@string/autocomplete_limited_results"
-    android:textAppearance="@style/VectorTextAppearanceCaption"
     android:textColor="?vctr_content_secondary" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 3f9457aa78..c83c36ed42 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -24,6 +24,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -31,7 +32,6 @@
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
@@ -42,10 +42,10 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_timestamp"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="@id/bottom_sheet_message_preview_sender"
         app:layout_constraintEnd_toEndOf="parent"
@@ -67,6 +67,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -74,7 +75,6 @@
         android:layout_marginBottom="4dp"
         android:ellipsize="end"
         android:maxLines="3"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:textIsSelectable="false"
         app:layout_constraintBottom_toTopOf="@+id/bottom_sheet_message_preview_body_details"
@@ -86,12 +86,12 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body_details"
+        style="@style/VectorTextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_tertiary"
         android:textIsSelectable="false"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index d444c328f0..7668bbec78 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -28,7 +28,7 @@
         android:drawablePadding="4dp"
         android:textColor="?vctr_content_secondary"
         android:textStyle="bold"
-        tools:text="@string/unable_to_send_message"
-        app:drawableStartCompat="@drawable/ic_warning_badge" />
+        app:drawableStartCompat="@drawable/ic_warning_badge"
+        tools:text="@string/unable_to_send_message" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
index 0cbf6a1eb9..69e8b1f076 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_radio.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -26,12 +26,12 @@
 
     <TextView
         android:id="@+id/actionTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -42,11 +42,11 @@
 
     <TextView
         android:id="@+id/actionDescription"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:maxLines="4"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index 10182e4543..36124c66e6 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -27,6 +27,7 @@
 
     <TextView
         android:id="@+id/bottomSheetRoomPreviewName"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
@@ -34,7 +35,6 @@
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index e5f77096d0..c3cdccd6b5 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -12,9 +12,9 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleTitle"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemBottomSheetTitleSubtitle"
@@ -25,10 +25,10 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleSubtitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_completion_homeserver.xml b/vector/src/main/res/layout/item_completion_homeserver.xml
index 40012d8bae..5e4ec08217 100644
--- a/vector/src/main/res/layout/item_completion_homeserver.xml
+++ b/vector/src/main/res/layout/item_completion_homeserver.xml
@@ -2,6 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
+    style="@style/VectorTextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
@@ -9,6 +10,5 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
-    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?android:attr/textColorAlertDialogListItem"
     tools:text="https://matrix.org" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index ac286fe580..fadb00bfb2 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -22,13 +22,13 @@
 
     <TextView
         android:id="@+id/actionTitleText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         tools:text="@string/invite_friends" />
 
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 7268f9d278..7b8ffd2312 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -11,13 +11,13 @@
 
     <TextView
         android:id="@+id/contactDetailName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="60dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@id/contactDetailMatrixId"
         app:layout_constraintEnd_toEndOf="parent"
@@ -28,12 +28,12 @@
 
     <TextView
         android:id="@+id/contactDetailMatrixId"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index e867e2da55..0663b2ed7d 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -22,6 +22,7 @@
 
     <TextView
         android:id="@+id/contactDisplayName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -29,7 +30,6 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?vctr_content_primary"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index d5e0964571..20a2690b5c 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -41,13 +41,13 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/createDirectRoomUserID"
@@ -59,11 +59,11 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserID"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 43b026dd60..78c7b2dcff 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -18,11 +18,11 @@
         <!-- In compact mode only this is shown-->
         <TextView
             android:id="@+id/itemDeviceSimpleSummary"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:minHeight="40dp"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             tools:text="Riot X" />
 
@@ -31,11 +31,11 @@
         -->
         <TextView
             android:id="@+id/itemDeviceDisplayNameLabel"
+            style="@style/VectorTextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/devices_details_name_title"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary" />
 
         <TextView
@@ -47,11 +47,11 @@
 
         <TextView
             android:id="@+id/itemDeviceIdLabel"
+            style="@style/VectorTextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/devices_details_id_title"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary" />
 
         <TextView
@@ -65,11 +65,11 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeenLabel"
+            style="@style/VectorTextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/devices_details_last_seen_title"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary" />
 
         <TextView
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index 5fe7544e3b..b520a8735a 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -30,9 +30,9 @@
 
         <TextView
             android:id="@+id/item_emoji_name"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             tools:text="Smiley Face" />
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 1c45f74402..1f474baeb7 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -9,11 +9,11 @@
 
     <im.vector.app.core.ui.views.NonScrollingTextView
         android:id="@+id/expandableContent"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:autoLink="web"
         android:ellipsize="end"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         app:layout_constraintBottom_toTopOf="@+id/expandableArrow"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_form_advanced_toggle.xml b/vector/src/main/res/layout/item_form_advanced_toggle.xml
index 5bb747b52c..da6b21a60d 100644
--- a/vector/src/main/res/layout/item_form_advanced_toggle.xml
+++ b/vector/src/main/res/layout/item_form_advanced_toggle.xml
@@ -18,13 +18,13 @@
 
     <TextView
         android:id="@+id/itemFormAdvancedToggleTitleView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:textStyle="bold"
         app:drawableTint="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 5adf720a63..30d2b15c22 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -10,12 +10,12 @@
 
     <TextView
         android:id="@+id/formSwitchTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:duplicateParentState="true"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@+id/formSwitchSummary"
         app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
@@ -26,10 +26,10 @@
 
     <TextView
         android:id="@+id/formSwitchSummary"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
diff --git a/vector/src/main/res/layout/item_generic_button.xml b/vector/src/main/res/layout/item_generic_button.xml
index 8da17b4eca..75d1e7a624 100644
--- a/vector/src/main/res/layout/item_generic_button.xml
+++ b/vector/src/main/res/layout/item_generic_button.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:padding="16dp">
 
     <Button
         android:id="@+id/itemGenericItemButton"
         style="@style/VectorButtonStyleText"
-        android:textAllCaps="false"
-        tools:icon="@drawable/ic_shield_warning"
-        app:iconGravity="textStart"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAllCaps="false"
+        app:iconGravity="textStart"
+        tools:icon="@drawable/ic_shield_warning"
         tools:text="Action Name" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index 138bc59cd5..6e2c0fa8f2 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -23,12 +23,12 @@
 
     <TextView
         android:id="@+id/emptyItemTitleView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="30dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/emptyItemMessageView"
@@ -40,6 +40,7 @@
 
     <TextView
         android:id="@+id/emptyItemMessageView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -48,7 +49,6 @@
         android:gravity="center"
         android:maxWidth="300dp"
         android:maxLines="10"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toTopOf="@+id/emptyItemButton"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index f01bf4a3e0..2e5e7fc5d5 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -2,13 +2,13 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemGenericHeaderText"
+    style="@style/VectorTextView.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
     android:paddingTop="4dp"
     android:paddingEnd="16dp"
     android:paddingBottom="4dp"
-    android:textAppearance="@style/VectorTextAppearanceSubtitle"
     android:textColor="?vctr_notice_text_color"
     android:textStyle="bold"
     tools:text="Today" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index a3b8c46e1f..da0e12cbfb 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -19,23 +19,23 @@
 
     <TextView
         android:id="@+id/itemGenericWithValueLabelText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="0dp"
         android:layout_weight="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         tools:text="Label" />
 
 
     <TextView
         android:id="@+id/itemGenericWithValueValueText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="0dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         tools:text="Value"
         tools:textColor="?colorPrimary" />
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index c257ee5052..2586fd4e6e 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -25,13 +25,13 @@
 
     <TextView
         android:id="@+id/groupNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index 2045e0be1c..a3c9666609 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -23,12 +23,12 @@
 
     <TextView
         android:id="@+id/itemHelpText"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:gravity="start"
         android:maxWidth="240dp"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 7f44e78ca7..9fdc5d6c1b 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -40,13 +40,13 @@
 
     <TextView
         android:id="@+id/knownUserName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/knownUserID"
@@ -58,11 +58,11 @@
 
     <TextView
         android:id="@+id/knownUserID"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_loading.xml b/vector/src/main/res/layout/item_loading.xml
index 0ad64d6b1d..03c0d81491 100644
--- a/vector/src/main/res/layout/item_loading.xml
+++ b/vector/src/main/res/layout/item_loading.xml
@@ -9,12 +9,12 @@
 
     <TextView
         android:id="@+id/loadingText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_margin="@dimen/layout_vertical_margin"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         tools:text="Waiting message" />
 
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index bfa504aa1b..ba78d12158 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -9,11 +9,11 @@
 
     <TextView
         android:id="@+id/localeTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@+id/localeSubtitle"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_login_text.xml b/vector/src/main/res/layout/item_login_text.xml
index 65c6024335..8d0fd994f6 100644
--- a/vector/src/main/res/layout/item_login_text.xml
+++ b/vector/src/main/res/layout/item_login_text.xml
@@ -2,6 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginText"
+    style="@style/VectorTextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
@@ -9,5 +10,4 @@
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
     android:textColor="?vctr_content_secondary"
-    android:textAppearance="@style/VectorTextAppearanceBody"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index d09c4f36b4..a77199b7af 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_title.xml
@@ -2,12 +2,12 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginTitleText"
+    style="@style/VectorTextView.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
     android:layout_marginTop="32dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/VectorTextAppearanceTitle"
     android:textColor="?vctr_content_primary"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index a0252d96ee..23b6d92461 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.xml
@@ -2,12 +2,12 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginTitleSmallText"
+    style="@style/VectorTextView.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
     android:layout_marginTop="16dp"
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
-    android:textAppearance="@style/VectorTextAppearanceSubtitle"
     android:textColor="?vctr_content_primary"
     tools:text="Login Title" />
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index a02f504a7e..52807dee0b 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -21,13 +21,13 @@
 
     <TextView
         android:id="@+id/troubleshootTestTitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/troubleshootTestDescription"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 54f7381182..4977c08a60 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -30,6 +30,7 @@
 
     <TextView
         android:id="@+id/actionTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -37,7 +38,6 @@
         android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/actionSubtitle"
@@ -50,13 +50,13 @@
 
     <TextView
         android:id="@+id/actionSubtitle"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:drawablePadding="16dp"
         android:ellipsize="end"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index df12a7f841..59d0ac3dc4 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -37,13 +37,13 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
@@ -55,13 +55,13 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -73,10 +73,10 @@
 
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index ddc477f4ef..e44a399208 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -37,13 +37,13 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
@@ -55,13 +55,13 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml
index 5eecca9da4..b80f7c7912 100644
--- a/vector/src/main/res/layout/item_profile_section.xml
+++ b/vector/src/main/res/layout/item_profile_section.xml
@@ -3,14 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemProfileSectionView"
     android:layout_width="match_parent"
-    tools:text="Security"
+    android:layout_height="56dp"
+    android:background="?vctr_list_separator_system"
     android:gravity="bottom"
-    android:paddingBottom="8dp"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
+    android:paddingBottom="8dp"
+    android:textColor="?vctr_content_primary"
     android:textSize="20sp"
     android:textStyle="bold"
-    android:textColor="?vctr_content_primary"
-    android:background="?vctr_list_separator_system"
-    android:layout_height="56dp"/>
+    tools:text="Security" />
 
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 049907b09d..01c44a138f 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -25,13 +25,13 @@
 
     <TextView
         android:id="@+id/itemPublicRoomName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomTopic"
@@ -62,6 +62,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomMembersCount"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -69,7 +70,6 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:minWidth="56dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_user"
         app:drawableTint="?vctr_content_secondary"
@@ -80,6 +80,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomAlias"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -88,7 +89,6 @@
         android:maxLines="1"
         android:minWidth="40dp"
         android:singleLine="true"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index c4a01be169..d799d75a65 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -11,9 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textStyle="bold"
-        android:textSize="20sp"
         android:textAllCaps="true"
+        android:textSize="20sp"
+        android:textStyle="bold"
         tools:text="Http Pusher" />
 
     <TextView
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index cd638617a1..e590faaae1 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -97,6 +97,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -105,7 +106,6 @@
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
@@ -135,6 +135,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
+        style="@style/VectorTextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -143,7 +144,6 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
@@ -156,10 +156,10 @@
 
     <TextView
         android:id="@+id/roomLastEventTimeView"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
         app:layout_constraintEnd_toEndOf="parent"
@@ -168,13 +168,13 @@
 
     <TextView
         android:id="@+id/roomLastEventView"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
@@ -183,13 +183,13 @@
 
     <TextView
         android:id="@+id/roomTypingView"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorPrimary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_room_alias_text_input.xml b/vector/src/main/res/layout/item_room_alias_text_input.xml
index 46ae5119c6..909d29d44d 100644
--- a/vector/src/main/res/layout/item_room_alias_text_input.xml
+++ b/vector/src/main/res/layout/item_room_alias_text_input.xml
@@ -9,11 +9,11 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHash"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:text="@string/matrix_room_alias_prefix"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         app:layout_constraintBaseline_toBaselineOf="@+id/itemRoomAliasTextInputLayout"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -42,11 +42,11 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHomeServer"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:maxWidth="200dp"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         app:layout_constraintBaseline_toBaselineOf="@+id/itemRoomAliasTextInputLayout"
         app:layout_constraintEnd_toEndOf="parent"
         tools:text=":matrix.org" />
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index c2142d0208..a87bdd3e9c 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -18,13 +18,13 @@
 
     <TextView
         android:id="@+id/roomCategoryTitleView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:textStyle="bold"
         app:drawableTint="?vctr_content_secondary"
@@ -33,6 +33,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
+        style="@style/VectorTextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -40,7 +41,6 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="24" />
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 11f2fd6ad5..e8633d7ea7 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -27,6 +27,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -34,7 +35,6 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryDescription"
@@ -47,6 +47,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryDescription"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -54,7 +55,6 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index 2d2e9207e1..1969f6473a 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -9,6 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -16,7 +17,6 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryServerDescription"
@@ -29,6 +29,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerDescription"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -36,7 +37,6 @@
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index 21dc303682..352b0e121a 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -6,12 +6,12 @@
     android:orientation="vertical">
 
     <TextView
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginTop="56dp"
         android:text="@string/room_filtering_footer_title"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary" />
 
     <Button
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index d6e6388fd3..69910d2b75 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -32,6 +32,7 @@
 
     <TextView
         android:id="@+id/roomInvitationNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -41,7 +42,6 @@
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:drawableEndCompat="@drawable/ic_arrow_right"
         app:layout_constrainedWidth="true"
@@ -54,12 +54,12 @@
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
         app:layout_constraintStart_toStartOf="@+id/roomInvitationNameView"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index c9a1dacc79..3482080a07 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -24,13 +24,13 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index 79a42c09a7..44b1f3e7b9 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -24,13 +24,13 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
         android:layout_marginEnd="4dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -42,6 +42,7 @@
 
     <TextView
         android:id="@+id/itemManageRoomSuggested"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -49,7 +50,6 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:text="@string/space_suggested"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 6eabb73b2d..98fd4a5036 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -19,6 +19,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -27,7 +28,6 @@
         android:layout_marginEnd="4dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
@@ -37,12 +37,12 @@
 
     <TextView
         android:id="@+id/messageTimeView"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="@+id/messageMemberNameView"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index de91d6aa8b..8920577431 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -13,11 +13,11 @@
 
     <TextView
         android:id="@+id/settings_item_text"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/settings_item_button"
diff --git a/vector/src/main/res/layout/item_settings_edit_text.xml b/vector/src/main/res/layout/item_settings_edit_text.xml
index a2666bc1de..4407e136a2 100644
--- a/vector/src/main/res/layout/item_settings_edit_text.xml
+++ b/vector/src/main/res/layout/item_settings_edit_text.xml
@@ -10,10 +10,10 @@
 
     <TextView
         android:id="@+id/settings_item_edit_text_description"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_settings_helper_info.xml b/vector/src/main/res/layout/item_settings_helper_info.xml
index 1cb39218ae..489f7a44bd 100644
--- a/vector/src/main/res/layout/item_settings_helper_info.xml
+++ b/vector/src/main/res/layout/item_settings_helper_info.xml
@@ -2,6 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_helper_text"
+    style="@style/VectorTextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="4dp"
@@ -10,7 +11,6 @@
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp"
-    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?vctr_content_secondary"
     tools:drawableStart="@drawable/vector_warning_red"
     tools:text="If you don’t want this, opt out below. You can also manage any of these preferences in Settings." />
diff --git a/vector/src/main/res/layout/item_settings_information.xml b/vector/src/main/res/layout/item_settings_information.xml
index 0b9e0ebcdf..0d91ba3d12 100644
--- a/vector/src/main/res/layout/item_settings_information.xml
+++ b/vector/src/main/res/layout/item_settings_information.xml
@@ -11,11 +11,11 @@
 
     <TextView
         android:id="@+id/settings_item_information"
+        style="@style/VectorTextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_settings_section_title.xml b/vector/src/main/res/layout/item_settings_section_title.xml
index 6416935a25..15c6afe70d 100644
--- a/vector/src/main/res/layout/item_settings_section_title.xml
+++ b/vector/src/main/res/layout/item_settings_section_title.xml
@@ -2,6 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_section_title_text"
+    style="@style/VectorTextView.HeadlineM"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?vctr_header_background"
@@ -9,7 +10,6 @@
     android:paddingTop="@dimen/layout_vertical_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="@dimen/layout_vertical_margin"
-    android:textAppearance="@style/VectorTextAppearanceHeadlineM"
     android:textColor="?vctr_content_primary"
     android:textStyle="bold"
     tools:text="Title" />
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index 7ce05c511d..175dfb63b9 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -18,21 +18,21 @@
 
         <TextView
             android:id="@+id/settings_item_title"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             tools:text="Title" />
 
         <TextView
             android:id="@+id/settings_item_description"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:orientation="vertical"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             tools:text="Description / Value" />
     </LinearLayout>
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 93a36c6b5d..13feeabcb3 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -26,10 +26,10 @@
 
     <TextView
         android:id="@+id/item_settings_three_pid_title"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/item_settings_three_pid_delete"
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index c07c1072ac..92d45ee02e 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -12,12 +12,12 @@
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoKey"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:gravity="center"
         android:lines="1"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="@color/emoji_color"
         tools:text="@sample/reactions.json/data/reaction" />
 
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index d38051a633..33d869e678 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -35,6 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
+        style="@style/VectorTextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -44,7 +45,6 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
         android:visibility="gone"
         app:layout_constraintCircle="@+id/groupAvatarImageView"
@@ -57,13 +57,13 @@
 
     <TextView
         android:id="@+id/groupNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/groupDescView"
@@ -75,13 +75,13 @@
 
     <TextView
         android:id="@+id/groupDescView"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index 41ca718f71..788590287d 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -29,6 +29,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -36,7 +37,6 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:text="@string/add_space"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index deabe59b93..551d6377c3 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -9,25 +9,26 @@
     android:paddingEnd="16dp">
 
     <TextView
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/spaces_header"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:drawableEndCompat="@drawable/ic_beta_pill" />
 
     <TextView
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/spaces_beta_welcome_to_spaces_desc"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary" />
 
     <TextView
         android:id="@+id/spaceBetaFeedbackAction"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -36,7 +37,6 @@
         android:paddingEnd="16dp"
         android:paddingBottom="8dp"
         android:text="@string/give_feedback"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="@color/vector_info_color"
         app:drawableStartCompat="@drawable/ic_feedback" />
 
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index f4e79eb364..44927969ca 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -41,6 +41,7 @@
 
         <TextView
             android:id="@+id/childRoomName"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -49,7 +50,6 @@
             android:layout_marginEnd="4dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/childRoomTopic"
@@ -61,10 +61,10 @@
 
         <TextView
             android:id="@+id/childRoomTopic"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="@id/spaceChildBarrier"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index a9e89db344..df7ff6164c 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -46,6 +46,7 @@
 
     <TextView
         android:id="@+id/childSpaceName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -55,7 +56,6 @@
         android:layout_marginBottom="16dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 4194b35693..08b053889d 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -35,11 +35,11 @@
 
     <TextView
         android:id="@+id/spaceSummaryTopic"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:autoLink="all"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 9a25aa6e45..7a8211cb94 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -35,6 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
+        style="@style/VectorTextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -44,7 +45,6 @@
         android:minHeight="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
         android:visibility="gone"
         app:layout_constraintCircle="@+id/groupAvatarImageView"
@@ -57,13 +57,13 @@
 
     <TextView
         android:id="@+id/groupNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index c9615465e8..abd0cc8705 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -38,6 +38,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -46,7 +47,6 @@
         android:duplicateParentState="true"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
@@ -59,13 +59,13 @@
 
     <TextView
         android:id="@+id/suggestedRoomDescription"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 12a63594a8..4418c0dfcd 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -26,6 +26,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -36,20 +37,19 @@
         android:layout_toEndOf="@+id/messageStartGuideline"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/messageTimeView"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         tools:text="@tools:sample/date/hhmm" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index 35e1b097d7..797323832b 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -10,8 +10,8 @@
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
         android:background="@drawable/highlighted_message_background" />
 
     <View
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 1415fd64d9..9d4e738823 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -16,13 +16,13 @@
 
     <TextView
         android:id="@+id/itemCallCreatorNameTextView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="4dp"
         android:drawablePadding="6dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         tools:text="@sample/users.json/data/displayName" />
@@ -30,6 +30,7 @@
 
     <TextView
         android:id="@+id/itemCallKindTextView"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -39,12 +40,12 @@
         android:layout_marginBottom="12dp"
         android:drawablePadding="4dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         tools:text="@string/action_video_call" />
 
     <TextView
         android:id="@+id/itemCallStatusTextView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -52,7 +53,6 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="12dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_notice_secondary"
         tools:text="@string/video_call_in_progress" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
index cb318026a6..fe9e29420e 100644
--- a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
@@ -10,10 +10,10 @@
 
         <TextView
             android:id="@+id/codeBlockTextView"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="monospace"
-            android:textAppearance="@style/VectorTextAppearanceBody" />
+            android:fontFamily="monospace" />
 
     </HorizontalScrollView>
 
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index 49e9bff53a..2b469ed13f 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -17,7 +17,7 @@
         android:gravity="center|start"
         android:minHeight="80dp"
         android:padding="16dp"
-        tools:text="This room is continuation…"
-        app:drawableStartCompat="@drawable/error" />
+        app:drawableStartCompat="@drawable/error"
+        tools:text="This room is continuation…" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index c05c0c2a72..352634041c 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -15,13 +15,13 @@
 
     <TextView
         android:id="@+id/itemDayTextView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="?android:colorBackground"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_tertiary"
         tools:text="@tools:sample/date/day_of_week" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index 751abd70b3..cc7f37179c 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -17,13 +17,13 @@
 
     <TextView
         android:id="@+id/itemDefaultTextView"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorSecondary"
         android:textStyle="italic"
         tools:text="@string/rendering_event_error_type_of_event_not_handled" />
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index 3eee2714e8..fdbf44d6ad 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -21,6 +21,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
@@ -30,7 +31,6 @@
             android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?colorSecondary"
             android:textStyle="italic" />
 
@@ -45,10 +45,10 @@
 
     <TextView
         android:id="@+id/itemMergedSummaryTextView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:textIsSelectable="false"
         tools:text="3 membership changes" />
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 61bb2c68d9..d7f49da9e3 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -77,11 +77,11 @@
 
         <TextView
             android:id="@+id/roomNameDescriptionText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -90,10 +90,10 @@
 
         <TextView
             android:id="@+id/roomNameTopicText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             android:textColorLink="?colorPrimary"
             app:layout_constraintEnd_toEndOf="parent"
@@ -155,6 +155,7 @@
 
         <TextView
             android:id="@+id/itemNoticeTextView"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -164,7 +165,6 @@
             android:layout_marginBottom="8dp"
             android:layout_toStartOf="@id/itemMergedExpandTextView"
             android:layout_toEndOf="@id/itemNoticeAvatarView"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             android:textStyle="italic"
             tools:text="@string/room_created_summary_item" />
@@ -172,6 +172,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
@@ -181,7 +182,6 @@
             android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?colorSecondary"
             android:textStyle="italic" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index a4fb8195a2..d9cd8b47a5 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -21,6 +21,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneTitleTextView"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -28,7 +29,6 @@
             android:drawablePadding="2dp"
             android:gravity="start"
             android:text="@string/notice_crypto_unable_to_decrypt_merged"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_secondary"
             app:drawableStartCompat="@drawable/ic_clock"
             app:drawableTint="?vctr_content_secondary" />
@@ -36,6 +36,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneDetailTextView"
+            style="@style/VectorTextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -44,13 +45,13 @@
             android:layout_marginBottom="12dp"
             android:gravity="center"
             android:text="@string/notice_crypto_unable_to_decrypt_friendly_desc"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_secondary"
             android:textStyle="italic" />
 
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
@@ -60,7 +61,6 @@
             android:paddingEnd="8dp"
             android:paddingBottom="4dp"
             android:text="@string/merged_events_expand"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?colorSecondary"
             android:textStyle="italic"
             android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index 30d26df243..c19260e3b4 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -17,13 +17,13 @@
 
     <TextView
         android:id="@+id/itemNoticeTextView"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:textStyle="italic"
         tools:text="@string/notice_avatar_url_changed" />
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index 2f8bf3420b..49c47e87fb 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -7,10 +7,10 @@
 
     <TextView
         android:id="@+id/optionLabelText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         tools:text="What would you like to do?" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index f32f261a5a..3ef5dc969b 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -23,11 +23,11 @@
 
         <TextView
             android:id="@+id/pollLabelText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginStart="4dp"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             tools:text="What would you like to do?" />
@@ -134,10 +134,10 @@
 
     <TextView
         android:id="@+id/pollInfosText"
+        style="@style/VectorTextView.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         tools:text="12 votes - Final Results"
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index 8bb58d14ff..63521dd78b 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -1,11 +1,11 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/VectorTextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:drawablePadding="8dp"
     android:gravity="center_vertical"
     android:text="@string/event_redacted"
-    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?vctr_content_tertiary"
     app:drawableStartCompat="@drawable/ic_trash_16"
     app:drawableTint="?vctr_content_tertiary" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index a1ded81e2f..7c2ac4d39a 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -8,12 +8,12 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneTitleTextView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:drawablePadding="6dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         tools:drawableStart="@drawable/ic_shield_trusted"
@@ -22,6 +22,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneDetailTextView"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -29,7 +30,6 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="12dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         tools:text="Alice (@alice:matrix.org)" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index c4fbed71fc..5713d9dc30 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -8,9 +8,9 @@
 
     <TextView
         android:id="@+id/messageTextView"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         tools:text="@sample/messages.json/data/message" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index fac551f312..8af7b6f3ce 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -9,12 +9,12 @@
 
     <TextView
         android:id="@+id/itemVerificationTitleTextView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:drawablePadding="6dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:drawableStartCompat="@drawable/ic_shield_black"
@@ -23,6 +23,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDetailTextView"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -30,7 +31,6 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="12dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         tools:text="Alice (@alice:matrix.org)" />
 
@@ -61,11 +61,11 @@
 
     <TextView
         android:id="@+id/itemVerificationStatusText"
+        style="@style/VectorTextView.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:text="@string/verification_request_you_accepted"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_notice_secondary"
         android:visibility="gone"
         tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 5754bf2fc3..780856a5cd 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -9,11 +9,11 @@
 
     <TextView
         android:id="@+id/itemWidgetTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="6dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:drawableTint="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index 3ef212edc0..c6272d8d9d 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -13,6 +13,7 @@
         android:background="@color/notification_accent_color" />
 
     <TextView
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -21,7 +22,6 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:text="@string/timeline_unread_messages"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="@color/notification_accent_color" />
 
 </FrameLayout>
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index 408cd4852f..c326ee8ac2 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -25,13 +25,13 @@
 
     <TextView
         android:id="@+id/itemUnknownRoomName"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index ac11096a6b..3d525407a5 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -22,12 +22,12 @@
 
     <TextView
         android:id="@+id/uploadsFileTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/uploadsFileSubtitle"
@@ -39,11 +39,11 @@
 
     <TextView
         android:id="@+id/uploadsFileSubtitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:ellipsize="end"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/uploadsFileTitle"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index d65e77b223..7d6c151462 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -23,13 +23,13 @@
 
     <TextView
         android:id="@+id/itemUserId"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemUserName"
@@ -41,12 +41,12 @@
 
     <TextView
         android:id="@+id/itemUserName"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index adefde99ea..efdd90f68d 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -33,10 +33,10 @@
 
     <TextView
         android:id="@+id/itemVerificationActionTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?colorPrimary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/itemVerificationActionSubTitle"
@@ -49,10 +49,10 @@
 
     <TextView
         android:id="@+id/itemVerificationActionSubTitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constrainedWidth="true"
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index 7fe4dd48ba..5d3c8ef4fc 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -2,12 +2,12 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationNoticeText"
+    style="@style/VectorTextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp"
-    android:textAppearance="@style/VectorTextAppearanceBody"
     android:textColor="?vctr_content_primary"
     tools:text="todo" />
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index 6a612a5f67..ecd7abae78 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -84,12 +84,12 @@
 
 
     <TextView
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:gravity="center"
         android:text="@string/or_other_mx_capabale_client"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index 90665964c3..6ef3f813ee 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -12,9 +12,9 @@
 
     <TextView
         android:id="@+id/itemVerificationWaitingTitle"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/media_upload_download_progress_layout.xml b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
index f581bbf7de..f5fdc14c8e 100644
--- a/vector/src/main/res/layout/media_upload_download_progress_layout.xml
+++ b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
@@ -8,10 +8,10 @@
 
     <TextView
         android:id="@+id/mediaProgressTextView"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         tools:text="Information" />
 
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index 10ec4bc4e2..b4cf120b8a 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -37,13 +37,13 @@
 
     <TextView
         android:id="@+id/overlayCounterText"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorOnPrimary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/overlayInfoText"
@@ -55,12 +55,12 @@
 
     <TextView
         android:id="@+id/overlayInfoText"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorOnPrimary"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
         app:layout_constraintEnd_toStartOf="@id/overlayShareButton"
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index bc606521b0..fbeb0b0ea4 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -36,6 +36,7 @@
 
     <TextView
         android:id="@+id/reactionText"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
         android:layout_marginStart="6dp"
@@ -44,7 +45,6 @@
         android:maxEms="10"
         android:minWidth="20dp"
         android:singleLine="true"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="@color/emoji_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/reactionCount"
@@ -55,13 +55,13 @@
 
     <TextView
         android:id="@+id/reactionCount"
+        style="@style/VectorTextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
         android:layout_marginEnd="8dp"
         android:gravity="center"
         android:maxLines="1"
-        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?vctr_content_secondary"
         android:textStyle="bold"
         app:autoSizeMaxTextSize="14sp"
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index 1d21f5d7cc..f5f9703081 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -7,6 +7,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/actionUnreadCounterBadgeView"
+        style="@style/VectorTextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"
@@ -17,7 +18,6 @@
         android:minHeight="8dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:textAppearance="@style/VectorTextAppearanceMicro"
         android:textColor="?colorOnError"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="4" />
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 78a8e6359e..e3144d0d25 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -21,12 +21,12 @@
 
     <TextView
         android:id="@+id/inviteNameView"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/VectorTextAppearanceTitle"
         android:textColor="?vctr_content_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -35,12 +35,12 @@
 
     <TextView
         android:id="@+id/inviteIdentifierView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:paddingStart="@dimen/layout_horizontal_margin"
         android:paddingEnd="@dimen/layout_horizontal_margin"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -49,11 +49,11 @@
 
     <TextView
         android:id="@+id/inviteLabelView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
         android:text="@string/send_you_invite"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index 3fbb180e11..e6f76a71b3 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -38,10 +38,10 @@
 
         <TextView
             android:id="@+id/bottomSheetActionTitle"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?colorPrimary"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@+id/bottomSheetActionSubTitle"
@@ -54,10 +54,10 @@
 
         <TextView
             android:id="@+id/bottomSheetActionSubTitle"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             android:visibility="gone"
             app:layout_constrainedWidth="true"
diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml
index c985b1e9de..e245980cd3 100644
--- a/vector/src/main/res/layout/view_current_calls.xml
+++ b/vector/src/main/res/layout/view_current_calls.xml
@@ -10,6 +10,7 @@
 
     <TextView
         android:id="@+id/currentCallsInfo"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/returnToCallButton"
@@ -20,7 +21,6 @@
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
         android:text="@string/call_only_active"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?colorOnPrimary"
         app:drawableStartCompat="@drawable/ic_call_answer"
         app:drawableTint="?colorOnPrimary" />
@@ -28,6 +28,7 @@
     <Button
         android:id="@+id/returnToCallButton"
         style="@style/VectorButtonStyleText.OnPrimary"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/currentCallsInfo"
@@ -39,7 +40,6 @@
         android:paddingStart="8dp"
         android:paddingEnd="16dp"
         android:text="@string/action_return"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textStyle="bold" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index dff0b581f4..bc66a11dfc 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -20,6 +20,7 @@
 
     <TextView
         android:id="@+id/failedMessagesWarningTextView"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -27,7 +28,6 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:text="@string/event_status_failed_messages_warning"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         app:drawableStartCompat="@drawable/ic_sending_message_failed"
         app:layout_constraintBottom_toBottomOf="@id/failedMessagesRetryButton"
@@ -49,12 +49,12 @@
 
     <Button
         android:id="@+id/failedMessagesRetryButton"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:text="@string/global_retry"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         app:icon="@drawable/ic_retry_sending_messages"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index ddeff897f2..a6ee178152 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -31,11 +31,11 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_1"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
         android:text="@string/secure_backup_banner_setup_line1"
-        android:textAppearance="@style/VectorTextAppearanceHeadlineM"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toTopOf="@id/view_keys_backup_banner_text_2"
         app:layout_constraintEnd_toStartOf="@id/view_keys_backup_banner_barrier"
@@ -44,11 +44,11 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_2"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
         android:text="@string/secure_backup_banner_setup_line2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/view_keys_backup_banner_space2"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
index df8cc27c89..7cd1de858b 100644
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ b/vector/src/main/res/layout/view_poll_result_line.xml
@@ -21,21 +21,21 @@
 
     <TextView
         android:id="@+id/pollResultItemLabel"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         tools:text="Open a Github Issue" />
 
 
     <TextView
         android:id="@+id/pollResultItemPercent"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         tools:text="47%" />
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index d05a96f63c..9ca38acf59 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -7,11 +7,11 @@
 
     <TextView
         android:id="@+id/receiptMore"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginEnd="8dp"
         android:gravity="center"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         tools:text="999+" />
 
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index bd6ec9c832..ae17a62ab5 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -8,6 +8,7 @@
 
     <TextView
         android:id="@+id/receiptMore"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/item_event_message_state_size"
         android:background="@drawable/pill_receipt"
@@ -15,7 +16,6 @@
         android:importantForAccessibility="no"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_primary"
         tools:text="999+" />
 
diff --git a/vector/src/main/res/layout/view_room_widgets_banner.xml b/vector/src/main/res/layout/view_room_widgets_banner.xml
index c0f6c2efd4..4cb1010201 100644
--- a/vector/src/main/res/layout/view_room_widgets_banner.xml
+++ b/vector/src/main/res/layout/view_room_widgets_banner.xml
@@ -8,6 +8,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsLabel"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
@@ -17,7 +18,6 @@
         android:paddingTop="8dp"
         android:paddingEnd="12dp"
         android:paddingBottom="8dp"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_room_active_widgets_banner_text"
         tools:text="2 active widgets" />
 
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index 4f28160de9..1109860c82 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -23,12 +23,12 @@
 
     <TextView
         android:id="@+id/title"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
         android:gravity="start"
-        android:textAppearance="@style/VectorTextAppearanceSubtitle"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/subTitle"
@@ -40,12 +40,12 @@
 
     <TextView
         android:id="@+id/subTitle"
+        style="@style/VectorTextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
         android:gravity="start"
-        android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index d413f49f88..008372b4c5 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -26,11 +26,11 @@
 
         <TextView
             android:id="@+id/errorMessageView"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             tools:text="Une erreur est survenue" />
 
@@ -75,11 +75,11 @@
 
         <TextView
             android:id="@+id/emptyTitleView"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
-            android:textAppearance="@style/VectorTextAppearanceSubtitle"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/emptyMessageView"
@@ -91,12 +91,12 @@
 
         <TextView
             android:id="@+id/emptyMessageView"
+            style="@style/VectorTextView.Body"
             android:layout_width="220dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="20dp"
             android:gravity="center"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 1b4f4e98d8..fe17be0e2f 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -55,12 +55,12 @@
 
         <TextView
             android:id="@+id/memberProfileIdView"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="16dp"
             android:gravity="center"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/memberProfilePowerLevelView"
             app:layout_constraintEnd_toEndOf="parent"
@@ -70,11 +70,11 @@
 
         <TextView
             android:id="@+id/memberProfilePowerLevelView"
+            style="@style/VectorTextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:gravity="center"
-            android:textAppearance="@style/VectorTextAppearanceCaption"
             android:textColor="?vctr_content_primary"
             app:layout_constraintBottom_toTopOf="@+id/memberProfileStatusView"
             app:layout_constraintEnd_toEndOf="parent"
@@ -84,10 +84,10 @@
 
         <TextView
             android:id="@+id/memberProfileStatusView"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textAppearance="@style/VectorTextAppearanceBody"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 2e4db9b2a9..0b31b3d510 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -45,13 +45,13 @@
 
     <TextView
         android:id="@+id/roomProfileAliasView"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:singleLine="true"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml
index 8ec098ea7e..186d54f799 100644
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@@ -18,12 +18,12 @@
 
     <TextView
         android:id="@+id/url_preview_title"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/url_preview_close"
@@ -45,13 +45,13 @@
 
     <TextView
         android:id="@+id/url_preview_description"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:maxLines="4"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
@@ -60,6 +60,7 @@
 
     <TextView
         android:id="@+id/url_preview_site"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
@@ -67,7 +68,6 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:singleLine="true"
-        android:textAppearance="@style/VectorTextAppearanceBody"
         android:textColor="?vctr_content_tertiary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/url_preview_left_border"
diff --git a/vector/src/main/res/values/styles_buttons.xml b/vector/src/main/res/values/styles_buttons.xml
index 9f0b1aace0..a8c2508c25 100644
--- a/vector/src/main/res/values/styles_buttons.xml
+++ b/vector/src/main/res/values/styles_buttons.xml
@@ -5,6 +5,8 @@
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
+        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
     <style name="VectorButtonStyle.Destructive">
@@ -29,6 +31,8 @@
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
+        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
     <style name="VectorButtonStyleUnelevated.Bot">
@@ -43,6 +47,8 @@
     <style name="VectorButtonStyleText" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="colorControlHighlight">?colorSecondary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
+        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
     <style name="VectorButtonStyleText.OnPrimary">
@@ -54,6 +60,8 @@
         <item name="android:textAllCaps">false</item>
         <item name="strokeColor">@color/button_background_tint_selector</item>
         <item name="strokeWidth">1dp</item>
+        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
     <style name="AlerterButton" parent="VectorButtonStyleText">
diff --git a/vector/src/main/res/values/styles_text_view.xml b/vector/src/main/res/values/styles_text_view.xml
index 2efd1cee08..59bea680fe 100644
--- a/vector/src/main/res/values/styles_text_view.xml
+++ b/vector/src/main/res/values/styles_text_view.xml
@@ -1,8 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorTextView" parent="Widget.MaterialComponents.TextView">
+    <style name="VectorTextView" parent="Widget.MaterialComponents.TextView" />
 
+    <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
+    <style name="VectorTextView.Title">
+        <item name="android:textAppearance">@style/VectorTextAppearanceTitle</item>
+        <item name="lineHeight">32sp</item>
+    </style>
+
+    <style name="VectorTextView.Title.M">
+        <item name="android:textAppearance">@style/VectorTextAppearanceTitle.M</item>
+    </style>
+
+    <style name="VectorTextView.HeadlineM">
+        <item name="android:textAppearance">@style/VectorTextAppearanceHeadlineM</item>
+    </style>
+
+    <style name="VectorTextView.Subtitle">
+        <item name="android:textAppearance">@style/VectorTextAppearanceSubtitle</item>
+    </style>
+
+    <style name="VectorTextView.Subtitle.M">
+        <item name="android:textAppearance">@style/VectorTextAppearanceSubtitle.M</item>
+    </style>
+
+    <style name="VectorTextView.Body">
+        <item name="android:textAppearance">@style/VectorTextAppearanceBody</item>
+        <item name="lineHeight">20sp</item>
+    </style>
+
+    <style name="VectorTextView.Body.M">
+        <item name="android:textAppearance">@style/VectorTextAppearanceBody.M</item>
+    </style>
+
+    <style name="VectorTextView.Caption">
+        <item name="android:textAppearance">@style/VectorTextAppearanceCaption</item>
+        <item name="lineHeight">16sp</item>
+    </style>
+
+    <style name="VectorTextView.Micro">
+        <item name="android:textAppearance">@style/VectorTextAppearanceMicro</item>
+        <item name="lineHeight">16sp</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/text_appearances.xml b/vector/src/main/res/values/text_appearances.xml
index d65bcdc6d0..779c2610ff 100644
--- a/vector/src/main/res/values/text_appearances.xml
+++ b/vector/src/main/res/values/text_appearances.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!-- Doc: https://medium.com/androiddevelopers/whats-your-text-s-appearance-f3a1729192d -->
+
     <style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">24sp</item>
         <item name="android:letterSpacing">0</item>
-        <item name="lineHeight">32sp</item>
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
@@ -42,7 +43,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">14sp</item>
         <item name="android:letterSpacing">0</item>
-        <item name="lineHeight">20sp</item>
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
@@ -56,7 +56,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">12sp</item>
         <item name="android:letterSpacing">0</item>
-        <item name="lineHeight">16sp</item>
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
@@ -65,7 +64,6 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">10sp</item>
         <item name="android:letterSpacing">0</item>
-        <item name="lineHeight">16sp</item>
     </style>
 
     <style name="VectorTextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
@@ -73,7 +71,6 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">16sp</item>
         <item name="android:letterSpacing">0.02</item>
-        <item name="lineHeight">24sp</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index bf03ab878d..742d7d4a58 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -74,7 +74,7 @@
         <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/VectorTextView</item>
+        <item name="android:textViewStyle">@style/VectorTextView.Body</item>
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 758b120c5f..6c27be7927 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -74,7 +74,7 @@
         <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/VectorTextView</item>
+        <item name="android:textViewStyle">@style/VectorTextView.Body</item>
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>

From e7146f251bcdceeb5651c848b5929e244a1d6fc0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 23:10:04 +0200
Subject: [PATCH 15/49] Use AppCompatTextView

---
 .../java/im/vector/app/core/ui/views/NonScrollingTextView.kt  | 4 ++--
 .../app/features/home/room/list/UnreadCounterBadgeView.kt     | 4 ++--
 vector/src/main/res/layout/item_breadcrumbs.xml               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt b/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt
index 712432abfd..6c9b3d19fc 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/NonScrollingTextView.kt
@@ -18,9 +18,9 @@ package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
+import com.google.android.material.textview.MaterialTextView
 
-class NonScrollingTextView : AppCompatTextView {
+class NonScrollingTextView : MaterialTextView {
     constructor(context: Context) : super(context)
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
index cc7271b55f..9887e06654 100755
--- a/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.home.room.list
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
-import androidx.appcompat.widget.AppCompatTextView
+import com.google.android.material.textview.MaterialTextView
 import im.vector.app.R
 
-class UnreadCounterBadgeView : AppCompatTextView {
+class UnreadCounterBadgeView : MaterialTextView {
 
     constructor(context: Context) : super(context)
 
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index a1ca9baa21..0fe9d4b61a 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -38,13 +38,13 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/breadcrumbsUnreadCounterBadgeView"
+        style="@style/VectorTextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:minWidth="18dp"
         android:minHeight="18dp"
         android:textColor="?colorOnError"
-        android:textSize="11sp"
         android:visibility="gone"
         app:layout_constraintCircle="@+id/breadcrumbsImageView"
         app:layout_constraintCircleAngle="45"
@@ -56,6 +56,7 @@
 
     <TextView
         android:id="@+id/breadcrumbsTypingView"
+        style="@style/VectorTextView.Micro"
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:background="@drawable/circle"
@@ -63,7 +64,6 @@
         android:gravity="center"
         android:text="@string/ellipsis"
         android:textColor="?colorOnPrimary"
-        android:textSize="11sp"
         android:textStyle="bold"
         android:visibility="gone"
         app:layout_constraintCircle="@+id/breadcrumbsImageView"

From c248670750315fbcab1a8223288d482cd49f85bd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 14 Jun 2021 23:13:35 +0200
Subject: [PATCH 16/49] issue

---
 vector/src/main/res/layout/view_current_calls.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml
index e245980cd3..e3389ddb63 100644
--- a/vector/src/main/res/layout/view_current_calls.xml
+++ b/vector/src/main/res/layout/view_current_calls.xml
@@ -28,7 +28,6 @@
     <Button
         android:id="@+id/returnToCallButton"
         style="@style/VectorButtonStyleText.OnPrimary"
-        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/currentCallsInfo"

From f0b28742aca4e24392066d949090f53f3a88136d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 10:30:54 +0200
Subject: [PATCH 17/49] textSize *sp -> style

---
 tools/check/check_code_quality.sh             | 16 +++++++-
 tools/check/forbidden_strings_in_layout.txt   | 27 +++++++++++++
 .../src/debug/res/layout/item_sas_emoji.xml   |  2 +-
 vector/src/main/res/layout/activity_call.xml  |  2 +-
 .../res/layout/bottom_sheet_bootstrap.xml     |  5 ++-
 .../res/layout/bottom_sheet_call_dial_pad.xml |  4 +-
 .../bottom_sheet_room_widget_permission.xml   |  2 +-
 .../layout/bottom_sheet_save_recovery_key.xml | 10 +++--
 .../res/layout/bottom_sheet_verification.xml  |  3 +-
 .../custom_action_item_layout_badge.xml       |  6 +--
 .../res/layout/dialog_disclaimer_content.xml  |  2 +-
 .../main/res/layout/dialog_event_content.xml  |  6 ++-
 .../layout/dialog_recovery_key_saved_info.xml |  2 +-
 .../main/res/layout/fragment_home_detail.xml  |  4 +-
 .../fragment_keys_backup_restore_success.xml  |  2 +-
 .../fragment_keys_backup_setup_step2.xml      |  2 +-
 .../fragment_keys_backup_setup_step3.xml      |  4 +-
 ...ment_space_create_choose_private_model.xml |  2 +-
 .../fragment_space_create_choose_type.xml     |  2 +-
 .../layout/fragment_ssss_access_from_key.xml  |  2 +-
 .../fragment_ssss_access_from_passphrase.xml  |  2 +-
 .../res/layout/fragment_ssss_reset_all.xml    |  4 +-
 .../src/main/res/layout/grid_item_emoji.xml   |  9 +----
 .../res/layout/item_autocomplete_emoji.xml    |  2 +-
 .../res/layout/item_bottom_sheet_action.xml   |  4 +-
 .../item_bottom_sheet_quick_reaction.xml      | 39 +++++++------------
 .../item_create_direct_room_letter_header.xml |  3 +-
 .../src/main/res/layout/item_emoji_result.xml |  3 +-
 .../src/main/res/layout/item_emoji_verif.xml  |  1 +
 .../main/res/layout/item_profile_section.xml  |  2 +-
 .../src/main/res/layout/item_public_room.xml  |  2 +-
 .../src/main/res/layout/item_pushgateway.xml  |  2 +-
 ...meline_event_merged_room_creation_stub.xml |  2 +-
 .../item_user_directory_letter_header.xml     |  3 +-
 .../main/res/layout/item_user_list_header.xml |  3 +-
 .../layout/item_verification_decimal_code.xml |  6 +--
 ...ew_sign_out_bottom_sheet_action_button.xml |  4 +-
 .../view_stub_room_member_profile_header.xml  |  2 +-
 .../layout/view_stub_room_profile_header.xml  |  2 +-
 39 files changed, 113 insertions(+), 87 deletions(-)
 create mode 100644 tools/check/forbidden_strings_in_layout.txt

diff --git a/tools/check/check_code_quality.sh b/tools/check/check_code_quality.sh
index 0b4272cbfe..7decb985bb 100755
--- a/tools/check/check_code_quality.sh
+++ b/tools/check/check_code_quality.sh
@@ -95,6 +95,14 @@ ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_resources.txt
 
 resultForbiddenStringInResource=$?
 
+echo
+echo "Search for forbidden patterns in layouts..."
+
+${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_layout.txt \
+    ./vector/src/main/res/layout
+
+resultForbiddenStringInLayout=$?
+
 #######################################################################################################################
 # Check files with long lines
 #######################################################################################################################
@@ -156,7 +164,13 @@ fi
 
 echo
 
-if [[ ${resultNbOfDrawable} -eq 0 ]] && [[ ${resultForbiddenStringInCode} -eq 0 ]] && [[ ${resultForbiddenStringInCodeSdk} -eq 0 ]] && [[ ${resultForbiddenStringInResource} -eq 0 ]] && [[ ${resultLongFiles} -eq 0 ]] && [[ ${resultPngInDrawable} -eq 0 ]]; then
+if [[ ${resultNbOfDrawable} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInCode} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInCodeSdk} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInResource} -eq 0 ]] \
+   && [[ ${resultForbiddenStringInLayout} -eq 0 ]] \
+   && [[ ${resultLongFiles} -eq 0 ]] \
+   && [[ ${resultPngInDrawable} -eq 0 ]]; then
    echo "MAIN OK"
 else
    echo "❌ MAIN ERROR"
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
new file mode 100644
index 0000000000..dbbd7270d7
--- /dev/null
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -0,0 +1,27 @@
+#
+# Copyright 2021 New Vector Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This file list String which are not allowed in source code.
+# Use Perl regex to write forbidden strings
+# Note: line cannot start with a space. Use \s instead.
+# It is possible to specify an authorized number of occurrence with === suffix. Default is 0
+# Example:
+# AuthorizedStringThreeTimes===3
+
+# Extension:xml
+
+### Use style="@style/VectorTextView.*" instead of textSize attribute
+android:textSize===9
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index 94e0689b1f..ee2f068f1e 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -22,11 +22,11 @@
 
     <TextView
         android:id="@+id/sas_emoji"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:textColor="@color/emoji_color"
-        android:textSize="22sp"
         tools:text="🔧" />
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index c8d1a34446..aa84e01e06 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -98,6 +98,7 @@
 
     <TextView
         android:id="@+id/participantNameText"
+        style="@style/VectorTextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -105,7 +106,6 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:gravity="center"
         android:textColor="@android:color/white"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 08533c5249..512e596fc8 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -31,17 +31,18 @@
 
         <TextView
             android:id="@+id/bootstrapTitleText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:ellipsize="end"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/bootstrapIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/bootstrapIcon"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/bootstrapIcon"
             tools:text="@string/bottom_sheet_setup_secure_backup_title" />
 
         <androidx.fragment.app.FragmentContainerView
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
index 136f98c753..cfc6716c0c 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
@@ -16,13 +16,13 @@
 
         <TextView
             android:id="@+id/callDialPadTitle"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="@string/call_dial_pad_title"
-            android:textColor="?vctr_content_primary"
-            android:textSize="20sp" />
+            android:textColor="?vctr_content_primary" />
 
         <ImageView
             android:id="@+id/callDialPadClose"
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index dd6009c655..f99dff6e51 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -11,6 +11,7 @@
 
 
     <TextView
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -18,7 +19,6 @@
         android:layout_marginBottom="8dp"
         android:text="@string/room_widget_permission_title"
         android:textColor="?vctr_content_primary"
-        android:textSize="20sp"
         android:textStyle="bold" />
 
     <TextView
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 7f1e9be156..fdc3a49ae9 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -10,22 +10,22 @@
     android:paddingBottom="8dp">
 
     <TextView
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/keys_backup_setup_step3_copy_button_title"
         android:textAlignment="center"
-        android:textSize="17sp"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/keys_backup_recovery_key_text"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_margin="@dimen/layout_horizontal_margin"
         android:fontFamily="monospace"
         android:textAlignment="center"
-        android:textSize="20sp"
         tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
 
     <LinearLayout
@@ -52,11 +52,12 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/keys_backup_setup_step3_share_recovery_file"
-            android:textSize="17sp" />
+            android:textColor="?vctr_content_primary" />
 
     </LinearLayout>
 
@@ -84,11 +85,12 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/keys_backup_setup_step3_save_button_title"
-            android:textSize="17sp" />
+            android:textColor="?vctr_content_primary" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index f0591c608d..13316b2587 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -38,6 +38,7 @@
 
         <TextView
             android:id="@+id/otherUserNameText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -45,8 +46,8 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@+id/otherUserAvatarImageView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/otherUserAvatarImageView"
             app:layout_constraintTop_toTopOf="@+id/otherUserAvatarImageView"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index 05ccbf4c2b..5339e7dc61 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -24,12 +24,12 @@
 
     <TextView
         android:id="@+id/cart_badge"
-        android:layout_width="12dp"
-        android:layout_height="12dp"
+        style="@style/VectorTextView.Micro"
+        android:layout_width="14dp"
+        android:layout_height="14dp"
         android:background="@drawable/bg_unread_highlight"
         android:gravity="center"
         android:textColor="?colorOnError"
-        android:textSize="8sp"
         app:layout_constraintCircle="@+id/action_view_icon_image"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="12dp"
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index e3cd296fa5..bdee2e9b44 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -41,11 +41,11 @@
 
     <TextView
         android:id="@+id/disclaimerTextView"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/disclaimer_title"
         android:textColor="?vctr_content_primary"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
index 7ae0acf8f7..de4837d7ed 100644
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ b/vector/src/main/res/layout/dialog_event_content.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/event_content_text_view"
+        style="@style/VectorTextView.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
         android:fontFamily="monospace"
+        android:textColor="?vctr_content_primary"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        tools:text="Event content" />
+
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 8bd855fc77..1243ab27bf 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -34,6 +34,7 @@
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
+                style="@style/VectorTextView.HeadlineM"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -42,7 +43,6 @@
                 android:maxLines="2"
                 android:text="@string/keep_it_safe"
                 android:textColor="?vctr_content_primary"
-                android:textSize="20sp"
                 android:textStyle="bold" />
         </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index ccdfbe698c..ad95f98fab 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -77,19 +77,19 @@
 
                     <TextView
                         android:id="@+id/groupToolbarTitleView"
+                        style="@style/VectorTextView.HeadlineM"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:gravity="start"
                         android:maxLines="1"
                         android:textColor="?vctr_content_primary"
-                        android:textSize="20sp"
                         android:textStyle="bold"
                         tools:text="@tools:sample/lorem/random" />
 
                     <TextView
                         android:id="@+id/groupToolbarSpaceTitleView"
-                        style="@style/VectorTextView.Body"
+                        style="@style/VectorTextView.Subtitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index 5f1ddb7b61..c8a57d477c 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -21,12 +21,12 @@
 
     <TextView
         android:id="@+id/success_text"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:textAlignment="center"
         android:textColor="?vctr_content_primary"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 530af43aa5..d9fabc694f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -15,6 +15,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_title"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -24,7 +25,6 @@
             android:text="@string/keys_backup_setup_step2_text_title"
             android:textAlignment="center"
             android:textColor="?vctr_content_primary"
-            android:textSize="17sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 10bb4d2788..e2d932e851 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -27,6 +27,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -35,7 +36,6 @@
             android:text="@string/keys_backup_setup_step3_success_title"
             android:textAlignment="center"
             android:textColor="?vctr_content_primary"
-            android:textSize="17sp"
             android:textStyle="bold"
             android:visibility="gone"
             tools:visibility="visible" />
@@ -68,13 +68,13 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_recovery_key_text"
+            style="@style/VectorTextView.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_horizontal_margin"
             android:fontFamily="monospace"
             android:textAlignment="center"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:visibility="gone"
             tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index 24b15ce737..d4f63aec93 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,12 +13,12 @@
 
         <TextView
             android:id="@+id/headerText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/create_spaces_who_are_you_working_with"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 2c28a35cf2..40a915d9e9 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -21,13 +21,13 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            style="@style/VectorTextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:gravity="center"
             android:text="@string/create_spaces_choose_type_label"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
             app:layout_constraintTop_toBottomOf="@id/headerText"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index ecaaad76ba..eed347f82f 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -25,6 +25,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -32,7 +33,6 @@
             android:layout_marginEnd="16dp"
             android:text="@string/recovery_key"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ssss_shield"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 069294d600..c05c709b76 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -27,13 +27,13 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="16dp"
             android:text="@string/recovery_passphrase"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ssss_shield"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index 7612aaf4bc..9f94507788 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -12,6 +12,7 @@
 
         <TextView
             android:id="@+id/reset_title"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -19,7 +20,6 @@
             android:drawablePadding="8dp"
             android:text="@string/secure_backup_reset_all"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             android:tint="?vctr_content_primary"
             app:drawableStartCompat="@drawable/ic_alert_triangle"
@@ -43,6 +43,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_other_devices"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:layout_marginStart="16dp"
@@ -51,7 +52,6 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:textColor="?vctr_content_secondary"
-            android:textSize="17sp"
             android:visibility="gone"
             app:drawableStartCompat="@drawable/ic_smartphone"
             app:drawableTint="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/grid_item_emoji.xml b/vector/src/main/res/layout/grid_item_emoji.xml
index 24d2aff598..e302138d55 100644
--- a/vector/src/main/res/layout/grid_item_emoji.xml
+++ b/vector/src/main/res/layout/grid_item_emoji.xml
@@ -20,12 +20,5 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center" />
-    <!--<TextView-->
-    <!--android:layout_gravity="center"-->
-    <!--android:id="@+id/grid_item_emoji_text"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--tools:text="😀"-->
-    <!--android:textSize="24sp"-->
-    <!--/>-->
+
 </FrameLayout>
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index 8b4c78cdd9..62c435e6e5 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -10,11 +10,11 @@
 
     <TextView
         android:id="@+id/itemAutocompleteEmoji"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:textColor="@color/emoji_color"
-        android:textSize="20dp"
         tools:ignore="SpUsage"
         tools:text="@sample/reactions.json/data/reaction" />
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 348520b665..8f341f49a6 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -53,6 +53,7 @@
 
         <TextView
             android:id="@+id/actionTitle"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -60,8 +61,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="?vctr_content_secondary"
-            android:textSize="17sp"
-            tools:drawableEnd="@drawable/ic_material_expand_more_black"
+            tools:drawableEnd="@drawable/ic_expand_more"
             tools:drawableTint="?vctr_content_secondary"
             tools:text="kdqsksqdk" />
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index 23494c9006..339813f736 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -9,83 +9,74 @@
 
     <TextView
         android:id="@+id/quickReaction0"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="👍" />
 
     <TextView
         android:id="@+id/quickReaction1"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
         tools:text="👎" />
 
     <TextView
         android:id="@+id/quickReaction2"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="😀" />
 
 
     <TextView
         android:id="@+id/quickReaction3"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="🎉" />
 
     <TextView
         android:id="@+id/quickReaction4"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="😕" />
 
     <TextView
         android:id="@+id/quickReaction5"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="♥" />
 
     <TextView
         android:id="@+id/quickReaction6"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="24sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="🍆" />
 
     <TextView
         android:id="@+id/quickReaction7"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="26sp"
-        tools:ignore="MissingConstraints"
+        android:textColor="@color/emoji_black"
         tools:text="👀" />
 
     <androidx.constraintlayout.helper.widget.Flow
diff --git a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
index 1a7cd16176..ce4cc606ae 100644
--- a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/createDirectRoomLetterView"
+    style="@style/VectorTextView.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index b520a8735a..6490cb9ed9 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -11,14 +11,13 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin">
 
-    <!-- size in dp, because we do not want the display to be impacted by font size setting -->
     <TextView
         android:id="@+id/item_emoji_tv"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:textColor="@color/emoji_color"
-        android:textSize="25dp"
         tools:ignore="SpUsage"
         tools:text="@sample/reactions.json/data/reaction" />
 
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index 23a5b3bda5..0e71831e84 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -10,6 +10,7 @@
     <!-- size in dp, because we do not want the display to be impacted by font size setting -->
     <TextView
         android:id="@+id/item_emoji_tv"
+        style="@style/VectorTextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml
index b80f7c7912..c7011eef26 100644
--- a/vector/src/main/res/layout/item_profile_section.xml
+++ b/vector/src/main/res/layout/item_profile_section.xml
@@ -2,6 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemProfileSectionView"
+    style="@style/VectorTextView.Title"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="?vctr_list_separator_system"
@@ -10,7 +11,6 @@
     android:paddingEnd="16dp"
     android:paddingBottom="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     android:textStyle="bold"
     tools:text="Security" />
 
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 01c44a138f..1364cf77cb 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -43,6 +43,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomTopic"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -51,7 +52,6 @@
         android:maxLines="1"
         android:singleLine="true"
         android:textColor="?vctr_content_primary"
-        android:textSize="15sp"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index d799d75a65..ef86681e43 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -8,11 +8,11 @@
 
     <TextView
         android:id="@+id/pushGatewayKind"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:textAllCaps="true"
-        android:textSize="20sp"
         android:textStyle="bold"
         tools:text="Http Pusher" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index d7f49da9e3..0daf1672c3 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -63,12 +63,12 @@
 
         <TextView
             android:id="@+id/roomNameTileText"
+            style="@style/VectorTextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
             android:textColor="?vctr_content_primary"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index d33d5d4cfb..bd7c838015 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userDirectoryLetterView"
+    style="@style/VectorTextView.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index e3aae0e570..4b9f7ca9b9 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userListHeaderView"
+    style="@style/VectorTextView.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    android:textSize="20sp"
     tools:text="Recents | Contacts" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_verification_decimal_code.xml b/vector/src/main/res/layout/item_verification_decimal_code.xml
index 2eeb6902dc..0ba114c64b 100644
--- a/vector/src/main/res/layout/item_verification_decimal_code.xml
+++ b/vector/src/main/res/layout/item_verification_decimal_code.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationDecimalCode"
+    style="@style/VectorTextView.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
@@ -11,8 +11,4 @@
     android:textColor="?vctr_content_primary"
     android:textSize="28sp"
     android:textStyle="bold"
-    app:layout_constraintBottom_toBottomOf="@+id/sas_emoji_grid"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="@+id/sas_emoji_grid"
     tools:text="1234-4320-3905" />
diff --git a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
index 2a9c374f2d..4543cfcb46 100644
--- a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
@@ -32,12 +32,12 @@
 
         <TextView
             android:id="@+id/actionTitleText"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/secure_backup_setup"
-            android:textColor="?vctr_content_secondary"
-            android:textSize="17sp" />
+            android:textColor="?vctr_content_primary" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index fe17be0e2f..aa489b1c00 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -41,11 +41,11 @@
 
         <TextView
             android:id="@+id/memberProfileNameView"
+            style="@style/VectorTextView.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textAppearance="@style/Vector.Toolbar.Title"
-            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/memberProfileIdView"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 0b31b3d510..587c3213a2 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -31,11 +31,11 @@
 
     <TextView
         android:id="@+id/roomProfileNameView"
+        style="@style/VectorTextView.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textAppearance="@style/Vector.Toolbar.Title"
-        android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/roomProfileAliasView"
         app:layout_constraintEnd_toEndOf="parent"

From ea26dba1d31fd659ef9c8b4ff4741c5cb19c4f62 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 10:32:34 +0200
Subject: [PATCH 18/49] Remove unused layout

---
 .../layout/item_create_direct_room_letter_header.xml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 vector/src/main/res/layout/item_create_direct_room_letter_header.xml

diff --git a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
deleted file mode 100644
index ce4cc606ae..0000000000
--- a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/createDirectRoomLetterView"
-    style="@style/VectorTextView.HeadlineM"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="8dp"
-    android:fontFamily="sans-serif-medium"
-    android:padding="8dp"
-    android:textColor="?vctr_content_primary"
-    tools:text="C" />
\ No newline at end of file

From e918a6a93b7be82c27e6667fa50f9eba6f15c377 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 10:42:29 +0200
Subject: [PATCH 19/49] Style for Toolbar

---
 .../view_stub_room_member_profile_header.xml      |  3 +--
 .../res/layout/view_stub_room_profile_header.xml  |  3 +--
 vector/src/main/res/values/styles_toolbar.xml     | 15 ++-------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index aa489b1c00..6aac00a12d 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -41,11 +41,10 @@
 
         <TextView
             android:id="@+id/memberProfileNameView"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/VectorTextView.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textAppearance="@style/Vector.Toolbar.Title"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/memberProfileIdView"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 587c3213a2..43b6084666 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -31,11 +31,10 @@
 
     <TextView
         android:id="@+id/roomProfileNameView"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/VectorTextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:textAppearance="@style/Vector.Toolbar.Title"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/roomProfileAliasView"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/values/styles_toolbar.xml b/vector/src/main/res/values/styles_toolbar.xml
index faca4feb25..83edaa8f87 100644
--- a/vector/src/main/res/values/styles_toolbar.xml
+++ b/vector/src/main/res/values/styles_toolbar.xml
@@ -40,22 +40,11 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-    <!-- Action mode text style -->
-    <style name="Vector.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:textSize">20sp</item>
-        <item name="android:fontFamily">"sans-serif-medium"</item>
-    </style>
-
-    <style name="Vector.Toolbar.SubTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">"sans-serif"</item>
-    </style>
-
     <!-- Action mode style -->
     <style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
         <item name="background">?android:colorBackground</item>
-        <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
-        <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
+        <item name="titleTextStyle">@style/VectorTextView.Title</item>
+        <item name="subtitleTextStyle">@style/VectorTextView.Subtitle</item>
         <item name="actionMenuTextColor">?colorOnPrimary</item>
     </style>
 

From 1370bda263945bb0d62223a77ff880b4031ff6a2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 10:51:01 +0200
Subject: [PATCH 20/49] Fix issue of green back arrow on some screen

---
 vector/src/main/res/layout/fragment_matrix_profile.xml        | 1 -
 vector/src/main/res/layout/fragment_room_directory_picker.xml | 1 -
 vector/src/main/res/values/styles_toolbar.xml                 | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index dc663b7bff..80c9ea1620 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -16,7 +16,6 @@
             android:id="@+id/matrixProfileCollapsingToolbarLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:theme="@style/Vector.Toolbar.Profile"
             app:contentScrim="?android:colorBackground"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:scrimAnimationDuration="250"
diff --git a/vector/src/main/res/layout/fragment_room_directory_picker.xml b/vector/src/main/res/layout/fragment_room_directory_picker.xml
index 288ed7addb..acb905c0bd 100644
--- a/vector/src/main/res/layout/fragment_room_directory_picker.xml
+++ b/vector/src/main/res/layout/fragment_room_directory_picker.xml
@@ -15,7 +15,6 @@
             android:id="@+id/spaceExploreCollapsingToolbarLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:theme="@style/Vector.Toolbar.Profile"
             app:contentScrim="?android:colorBackground"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:scrimAnimationDuration="250"
diff --git a/vector/src/main/res/values/styles_toolbar.xml b/vector/src/main/res/values/styles_toolbar.xml
index 83edaa8f87..3131148996 100644
--- a/vector/src/main/res/values/styles_toolbar.xml
+++ b/vector/src/main/res/values/styles_toolbar.xml
@@ -48,8 +48,4 @@
         <item name="actionMenuTextColor">?colorOnPrimary</item>
     </style>
 
-    <style name="Vector.Toolbar.Profile" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">?colorSecondary</item>
-    </style>
-
 </resources>
\ No newline at end of file

From 7de5111070928b36f377131fa89e2bba8c7157de Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 11:17:55 +0200
Subject: [PATCH 21/49] Restore fragment_room_directory_picker.xml, was
 modified by mistake

---
 .../spaces/explore/SpaceDirectoryFragment.kt  | 10 ++--
 .../layout/fragment_room_directory_picker.xml | 51 ++++++-----------
 .../res/layout/fragment_space_directory.xml   | 55 +++++++++++++++++++
 3 files changed, 78 insertions(+), 38 deletions(-)
 create mode 100644 vector/src/main/res/layout/fragment_space_directory.xml

diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index cb163622fa..0d5e64d3d7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -40,7 +40,7 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.core.utils.isValidUrl
 import im.vector.app.core.utils.openUrlInExternalBrowser
-import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
+import im.vector.app.databinding.FragmentSpaceDirectoryBinding
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.matrixto.SpaceCardRenderer
 import im.vector.app.features.permalink.PermalinkHandler
@@ -63,7 +63,7 @@ class SpaceDirectoryFragment @Inject constructor(
         private val permalinkHandler: PermalinkHandler,
         private val spaceCardRenderer: SpaceCardRenderer,
         private val colorProvider: ColorProvider
-) : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
+) : VectorBaseFragment<FragmentSpaceDirectoryBinding>(),
         SpaceDirectoryController.InteractionListener,
         TimelineEventController.UrlClickCallback,
         OnBackPressed {
@@ -71,7 +71,7 @@ class SpaceDirectoryFragment @Inject constructor(
     override fun getMenuRes() = R.menu.menu_space_directory
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
-            FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
+            FragmentSpaceDirectoryBinding.inflate(layoutInflater, container, false)
 
     private val viewModel by activityViewModel(SpaceDirectoryViewModel::class)
 
@@ -85,7 +85,7 @@ class SpaceDirectoryFragment @Inject constructor(
             it.setDisplayHomeAsUpEnabled(true)
         }
         epoxyController.listener = this
-        views.roomDirectoryPickerList.configureWith(epoxyController)
+        views.spaceDirectoryList.configureWith(epoxyController)
 
         viewModel.selectSubscribe(this, SpaceDirectoryState::canAddRooms) {
             invalidateOptionsMenu()
@@ -97,7 +97,7 @@ class SpaceDirectoryFragment @Inject constructor(
 
     override fun onDestroyView() {
         epoxyController.listener = null
-        views.roomDirectoryPickerList.cleanup()
+        views.spaceDirectoryList.cleanup()
         super.onDestroyView()
     }
 
diff --git a/vector/src/main/res/layout/fragment_room_directory_picker.xml b/vector/src/main/res/layout/fragment_room_directory_picker.xml
index acb905c0bd..60dccd6e37 100644
--- a/vector/src/main/res/layout/fragment_room_directory_picker.xml
+++ b/vector/src/main/res/layout/fragment_room_directory_picker.xml
@@ -7,49 +7,34 @@
     android:layout_height="match_parent"
     android:background="?android:colorBackground">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/spaceExploreCollapsingToolbarLayout"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:contentScrim="?android:colorBackground"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-            app:scrimAnimationDuration="250"
-            app:scrimVisibleHeightTrigger="120dp"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="40dp">
-
-                <include
-                    android:id="@+id/spaceCard"
-                    layout="@layout/fragment_matrix_to_room_space_card" />
-
-            </FrameLayout>
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_collapseMode="pin" />
+                tools:title="Title" />
 
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-    </com.google.android.material.appbar.AppBarLayout>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/roomDirectoryPickerList"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+            tools:listitem="@layout/item_room_directory" />
 
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/roomDirectoryPickerList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:colorBackground"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:listitem="@layout/item_room_directory" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_directory.xml b/vector/src/main/res/layout/fragment_space_directory.xml
new file mode 100644
index 0000000000..3d5932df4a
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_space_directory.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/spaceExploreCollapsingToolbarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:contentScrim="?android:colorBackground"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            app:scrimAnimationDuration="250"
+            app:scrimVisibleHeightTrigger="120dp"
+            app:titleEnabled="false"
+            app:toolbarId="@+id/toolbar">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp">
+
+                <include
+                    android:id="@+id/spaceCard"
+                    layout="@layout/fragment_matrix_to_room_space_card" />
+
+            </FrameLayout>
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/spaceDirectoryList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorBackground"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/item_room_directory" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From f1a1f07a7b7b7cb4cbc5836d7f0f965a33e0d5ba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 11:18:01 +0200
Subject: [PATCH 22/49] Doc

---
 vector/src/main/res/values/text_appearances.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values/text_appearances.xml b/vector/src/main/res/values/text_appearances.xml
index 779c2610ff..e938cb5a98 100644
--- a/vector/src/main/res/values/text_appearances.xml
+++ b/vector/src/main/res/values/text_appearances.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Doc: https://medium.com/androiddevelopers/whats-your-text-s-appearance-f3a1729192d -->
+    <!-- Doc: https://medium.com/androiddevelopers/whats-your-text-s-appearance-f3a1729192d
+      List of supported attributes for a TextAppearance:
+      https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723-->
 
     <style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
         <item name="fontFamily">sans-serif</item>

From d892a8fe00efb8bb3432f24e3d2db7d07b738c3c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 11:22:17 +0200
Subject: [PATCH 23/49] Fix icon close color

---
 .../main/res/layout/fragment_contacts_book.xml   |  4 +++-
 ...agment_create_direct_room_directory_users.xml |  4 +++-
 .../src/main/res/layout/fragment_create_room.xml |  4 +++-
 .../src/main/res/layout/fragment_home_drawer.xml | 10 ++++++----
 .../main/res/layout/fragment_space_preview.xml   | 16 ++--------------
 .../main/res/layout/fragment_ssss_reset_all.xml  |  5 +++--
 .../main/res/layout/fragment_user_code_show.xml  |  4 +++-
 .../main/res/layout/fragment_user_directory.xml  |  4 +++-
 .../src/main/res/layout/fragment_user_list.xml   |  4 +++-
 .../main/res/layout/item_timeline_event_base.xml |  3 ++-
 10 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index 9c9f92a74c..9033a1fab3 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -37,7 +37,9 @@
                         android:src="@drawable/ic_x_18dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tint="?vctr_content_secondary"
+                        tools:ignore="MissingPrefix" />
 
                     <TextView
                         android:id="@+id/phoneBookTitle"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 0c93e7d755..77729fe4e0 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -37,7 +37,9 @@
                         android:src="@drawable/ic_x_18dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tint="?vctr_content_secondary"
+                        tools:ignore="MissingPrefix" />
 
                     <TextView
                         android:id="@+id/createDirectRoomTitle"
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index cd455a9b0d..a461fd55dc 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -34,7 +34,9 @@
                         android:src="@drawable/ic_x_18dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tint="?vctr_content_secondary"
+                        tools:ignore="MissingPrefix" />
 
                     <TextView
                         android:id="@+id/createRoomTitle"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index d86db0949a..4fd967e135 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -150,11 +150,12 @@
         android:minHeight="52dp"
         android:padding="16dp"
         android:text="@string/settings"
-        android:tint="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_settings_18dp"
         app:drawableTint="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:tint="?vctr_content_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/homeDrawerHeaderSignoutView"
@@ -168,10 +169,11 @@
         android:minHeight="52dp"
         android:padding="16dp"
         android:text="@string/logout"
-        android:tint="?vctr_content_secondary"
         app:drawableStartCompat="@drawable/ic_signout_18dp"
         app:drawableTint="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:tint="?vctr_content_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 7ad4b1e8e2..de3e5537ff 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -20,25 +20,13 @@
                 android:id="@+id/roomPreviewNoPreviewToolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?actionBarSize"
-                app:navigationIcon="@drawable/ic_x_18dp">
+                app:navigationIcon="@drawable/ic_x_18dp"
+                app:navigationIconTint="?vctr_content_secondary">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <!--                <ImageView-->
-                    <!--                    android:id="@+id/spacePreviewClose"-->
-                    <!--                    android:layout_width="@dimen/layout_touch_size"-->
-                    <!--                    android:layout_height="@dimen/layout_touch_size"-->
-                    <!--                    android:clickable="true"-->
-                    <!--                    android:focusable="true"-->
-                    <!--                    android:foreground="?attr/selectableItemBackground"-->
-                    <!--                    android:scaleType="center"-->
-                    <!--                    android:src="@drawable/ic_x_18dp"-->
-                    <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
                     <ImageView
                         android:id="@+id/spacePreviewToolbarAvatar"
                         android:layout_width="40dp"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index 9f94507788..0718a98982 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -21,11 +21,12 @@
             android:text="@string/secure_backup_reset_all"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            android:tint="?vctr_content_primary"
             app:drawableStartCompat="@drawable/ic_alert_triangle"
             app:drawableTint="?vctr_content_primary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?vctr_content_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/ssss_reset_all_description"
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index a3a746bc76..0d8cb778eb 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -33,7 +33,9 @@
                         android:src="@drawable/ic_x_18dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tint="?vctr_content_secondary"
+                        tools:ignore="MissingPrefix" />
 
                     <TextView
                         android:id="@+id/showUserCodeTitle"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index d6323fee47..8ffd18c2fc 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -37,7 +37,9 @@
                         android:src="@drawable/ic_x_18dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tint="?vctr_content_secondary"
+                        tools:ignore="MissingPrefix" />
 
                     <TextView
                         android:id="@+id/userDirectoryTitle"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 0f5eac1b36..a9abc3eff6 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -32,7 +32,9 @@
                     android:src="@drawable/ic_x_18dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="?vctr_content_secondary"
+                    tools:ignore="MissingPrefix" />
 
                 <TextView
                     android:id="@+id/userListTitle"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 4418c0dfcd..2f7bf6120a 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -159,8 +159,9 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
         android:indeterminateTint="?vctr_content_secondary"
-        android:tint="?vctr_content_tertiary"
         android:visibility="gone"
+        app:tint="?vctr_content_tertiary"
+        tools:ignore="MissingPrefix"
         tools:visibility="visible" />
 
     <LinearLayout

From f411d9954e23c736ca8e97f4048c5f1cd64ebf44 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 12:14:30 +0200
Subject: [PATCH 24/49] Rework drawer header, following Figma: more compact to
 let more space for spaces

---
 .../main/res/layout/fragment_home_drawer.xml  | 88 ++++++++-----------
 vector/src/main/res/values/colors.xml         |  5 --
 vector/src/main/res/values/theme_black.xml    |  1 -
 vector/src/main/res/values/theme_dark.xml     |  1 -
 vector/src/main/res/values/theme_light.xml    |  1 -
 5 files changed, 39 insertions(+), 57 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 4fd967e135..4a1421c61e 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -12,30 +12,16 @@
         android:id="@+id/homeDrawerHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?vctr_home_drawer_header_background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/homeDrawerHeaderDebugView"
-            style="@style/VectorDebug"
-            android:layout_width="@dimen/layout_touch_size"
-            android:layout_height="@dimen/layout_touch_size"
-            android:importantForAccessibility="no"
-            android:scaleType="center"
-            android:src="@drawable/ic_settings_x"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="?colorPrimary"
-            tools:ignore="MissingPrefix" />
-
         <ImageView
             android:id="@+id/homeDrawerHeaderAvatarView"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
             android:contentDescription="@string/avatar"
             android:transitionName="profile"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,66 +30,58 @@
 
         <TextView
             android:id="@+id/homeDrawerUsernameView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:maxLines="1"
             android:singleLine="true"
             android:textColor="?vctr_content_primary"
+            app:layout_constraintBottom_toTopOf="@+id/homeDrawerUserIdView"
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
-            app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
-            app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
+            app:layout_constraintStart_toEndOf="@+id/homeDrawerHeaderAvatarView"
+            app:layout_constraintTop_toTopOf="@+id/homeDrawerHeaderAvatarView"
+            app:layout_constraintVertical_chainStyle="packed"
             tools:text="@sample/users.json/data/displayName" />
 
         <TextView
             android:id="@+id/homeDrawerUserIdView"
-            style="@style/VectorTextView.Body"
+            style="@style/VectorTextView.Caption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
             android:layout_marginEnd="8dp"
             android:maxLines="1"
             android:singleLine="true"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@+id/homeDrawerInviteFriendButton"
+            app:layout_constraintBottom_toBottomOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
-            app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
+            app:layout_constraintStart_toStartOf="@+id/homeDrawerUsernameView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerUsernameView"
             tools:text="@sample/users.json/data/id" />
 
-        <Button
+        <ImageView
             android:id="@+id/homeDrawerQRCodeButton"
-            style="@style/Widget.MaterialComponents.Button.Icon"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
-            android:layout_marginTop="2dp"
+            android:layout_width="@dimen/layout_touch_size"
+            android:layout_height="@dimen/layout_touch_size"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:backgroundTint="?colorSurface"
-            android:elevation="0dp"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            android:padding="0dp"
+            android:contentDescription="@string/qr_code"
             android:rotationY="@integer/rtl_mirror_flip"
-            app:cornerRadius="17dp"
-            app:icon="@drawable/ic_qr_code_add"
-            app:iconGravity="textStart"
-            app:iconPadding="0dp"
-            app:iconSize="20dp"
-            app:iconTint="?colorPrimary"
+            android:scaleType="center"
+            android:src="@drawable/ic_qr_code_add"
+            app:layout_constraintBottom_toBottomOf="@id/homeDrawerHeaderAvatarView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/homeDrawerUsernameView" />
+            app:layout_constraintTop_toTopOf="@id/homeDrawerHeaderAvatarView"
+            app:tint="?vctr_content_tertiary"
+            tools:ignore="MissingPrefix" />
 
         <Button
             android:id="@+id/homeDrawerInviteFriendButton"
             style="@style/VectorButtonStyleText"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:layout_marginBottom="8dp"
             android:gravity="center"
             android:insetTop="0dp"
@@ -114,10 +92,22 @@
             app:iconGravity="textStart"
             app:iconSize="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
+            app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
+            tools:ignore="MissingPrefix" />
+
+        <ImageView
+            android:id="@+id/homeDrawerHeaderDebugView"
+            style="@style/VectorDebug"
+            android:layout_width="@dimen/layout_touch_size"
+            android:layout_height="@dimen/layout_touch_size"
+            android:importantForAccessibility="no"
+            android:scaleType="center"
+            android:src="@drawable/ic_settings_x"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/homeDrawerUserIdView" />
+            app:tint="?colorPrimary"
+            tools:ignore="MissingPrefix" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -135,7 +125,7 @@
         android:id="@+id/homeDrawerBottomSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?vctr_list_separator_on_surface"
+        android:background="?vctr_list_separator"
         app:layout_constraintBottom_toTopOf="@+id/homeDrawerHeaderSettingsView" />
 
     <TextView
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 60e63f7661..c63c8c0875 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -32,11 +32,6 @@
     <color name="black_alpha">#55000000</color>
     <color name="black_54">#8A000000</color>
 
-    <attr name="vctr_home_drawer_header_background" format="color" />
-    <color name="vctr_home_drawer_header_background_light">#FFF5F7FA</color>
-    <color name="vctr_home_drawer_header_background_dark">#FF22282F</color>
-    <color name="vctr_home_drawer_header_background_black">#FF000000</color>
-
     <!-- For Android status bar and navigation bar -->
     <color name="android_status_bar_background_light">@color/element_system_light</color>
     <color name="android_navigation_bar_background_light">@color/element_system_light</color>
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index e0df15b65b..98ab4213c3 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -7,7 +7,6 @@
         <!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
 
         <!-- other colors -->
-        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_black</item>
         <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_black</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_black</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 742d7d4a58..741a76afca 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -16,7 +16,6 @@
         <item name="vctr_system">@color/element_system_dark</item>
 
         <!-- other colors -->
-        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_dark</item>
         <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_dark</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_dark</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 6c27be7927..6047278ad2 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -16,7 +16,6 @@
         <item name="vctr_system">@color/element_system_light</item>
 
         <!-- other colors -->
-        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
         <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_light</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_light</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_light</item>

From f5f09224b10208a2ce7d15039e78c3b7fdc66b64 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 12:23:54 +0200
Subject: [PATCH 25/49] Create module for ui-styles

---
 library/ui-styles/.gitignore                  |  1 +
 library/ui-styles/build.gradle                | 54 +++++++++++++++++++
 .../ui-styles/src/main/AndroidManifest.xml    |  2 +
 settings.gradle                               |  1 +
 vector/build.gradle                           |  1 +
 5 files changed, 59 insertions(+)
 create mode 100644 library/ui-styles/.gitignore
 create mode 100644 library/ui-styles/build.gradle
 create mode 100644 library/ui-styles/src/main/AndroidManifest.xml

diff --git a/library/ui-styles/.gitignore b/library/ui-styles/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/library/ui-styles/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
new file mode 100644
index 0000000000..f1e2972b95
--- /dev/null
+++ b/library/ui-styles/build.gradle
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
+}
\ No newline at end of file
diff --git a/library/ui-styles/src/main/AndroidManifest.xml b/library/ui-styles/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..a144066b26
--- /dev/null
+++ b/library/ui-styles/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="im.vector.app.ui.styles"/>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 76a15a206d..b88ea99b05 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,3 +4,4 @@ include ':matrix-sdk-android-rx'
 include ':diff-match-patch'
 include ':attachment-viewer'
 include ':multipicker'
+include ':library:ui-styles'
diff --git a/vector/build.gradle b/vector/build.gradle
index 427e2e18af..356364e239 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -324,6 +324,7 @@ dependencies {
     implementation project(":diff-match-patch")
     implementation project(":multipicker")
     implementation project(":attachment-viewer")
+    implementation project(":library:ui-styles")
     implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

From 000b524b34c10d32780ae481c524c2fcf4b07416 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 12:39:39 +0200
Subject: [PATCH 26/49] Move style and theme to the dedicated module

---
 library/ui-styles/build.gradle                                | 4 ++++
 .../src/main/res/transition/image_preview_transition.xml      | 0
 .../ui-styles}/src/main/res/values-land/dimens.xml            | 0
 .../ui-styles}/src/main/res/values-land/styles.xml            | 0
 .../ui-styles}/src/main/res/values-land/styles_dial_pad.xml   | 0
 .../ui-styles}/src/main/res/values-ldrtl/integers.xml         | 0
 .../ui-styles}/src/main/res/values-sw600dp/dimens.xml         | 0
 .../ui-styles}/src/main/res/values-v23/theme_black.xml        | 0
 .../ui-styles}/src/main/res/values-v23/theme_dark.xml         | 0
 .../ui-styles}/src/main/res/values-v23/theme_light.xml        | 0
 .../ui-styles}/src/main/res/values-v27/theme_black.xml        | 0
 .../ui-styles}/src/main/res/values-v27/theme_dark.xml         | 0
 .../ui-styles}/src/main/res/values-v27/theme_light.xml        | 0
 .../ui-styles}/src/main/res/values-w820dp/dimens.xml          | 0
 .../src/main/res/values/attrs_room_message_colors.xml         | 0
 .../src/main/res/values/attrs_social_login_button.xml         | 0
 {vector => library/ui-styles}/src/main/res/values/bools.xml   | 0
 {vector => library/ui-styles}/src/main/res/values/colors.xml  | 0
 .../src/main/res/values/colors_password_strength.xml          | 0
 {vector => library/ui-styles}/src/main/res/values/dimens.xml  | 0
 .../ui-styles}/src/main/res/values/integers.xml               | 0
 {vector => library/ui-styles}/src/main/res/values/palette.xml | 0
 .../ui-styles}/src/main/res/values/palette_mobile.xml         | 0
 .../main/res/values/stylable_badge_floating_action_button.xml | 0
 .../src/main/res/values/stylable_bottom_sheet_action.xml      | 0
 .../src/main/res/values/stylable_button_state_view.xml        | 0
 .../src/main/res/values/stylable_max_height_scroll_view.xml   | 0
 .../src/main/res/values/stylable_pool_result_line.xml         | 0
 .../src/main/res/values/stylable_reaction_button.xml          | 0
 .../values/stylable_sign_out_bottom_sheet_action_button.xml   | 0
 .../src/main/res/values/stylable_social_login_button_view.xml | 0
 .../src/main/res/values/stylable_wizard_button_view.xml       | 0
 .../ui-styles}/src/main/res/values/style_snackbar.xml         | 0
 {vector => library/ui-styles}/src/main/res/values/styles.xml  | 0
 .../ui-styles}/src/main/res/values/styles_alert_dialog.xml    | 0
 .../ui-styles}/src/main/res/values/styles_attachments.xml     | 0
 .../src/main/res/values/styles_bottom_navigation.xml          | 0
 .../ui-styles}/src/main/res/values/styles_bottom_sheet.xml    | 0
 .../ui-styles}/src/main/res/values/styles_buttons.xml         | 0
 .../ui-styles}/src/main/res/values/styles_dial_pad.xml        | 0
 .../ui-styles}/src/main/res/values/styles_edit_text.xml       | 0
 .../ui-styles}/src/main/res/values/styles_label.xml           | 0
 .../ui-styles}/src/main/res/values/styles_login.xml           | 0
 .../ui-styles}/src/main/res/values/styles_pin_code.xml        | 0
 .../ui-styles}/src/main/res/values/styles_popup.xml           | 0
 .../ui-styles}/src/main/res/values/styles_progress.xml        | 0
 .../ui-styles}/src/main/res/values/styles_search_view.xml     | 0
 .../ui-styles}/src/main/res/values/styles_social_login.xml    | 0
 .../ui-styles}/src/main/res/values/styles_text_view.xml       | 0
 .../ui-styles}/src/main/res/values/styles_timeline.xml        | 0
 .../ui-styles}/src/main/res/values/styles_toolbar.xml         | 0
 .../ui-styles}/src/main/res/values/text_appearances.xml       | 0
 .../ui-styles}/src/main/res/values/theme_black.xml            | 0
 .../ui-styles}/src/main/res/values/theme_common.xml           | 0
 .../ui-styles}/src/main/res/values/theme_dark.xml             | 0
 .../ui-styles}/src/main/res/values/theme_light.xml            | 0
 56 files changed, 4 insertions(+)
 rename {vector => library/ui-styles}/src/main/res/transition/image_preview_transition.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-land/dimens.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-land/styles.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-land/styles_dial_pad.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-ldrtl/integers.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-sw600dp/dimens.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-v23/theme_black.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-v23/theme_dark.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-v23/theme_light.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-v27/theme_black.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-v27/theme_dark.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-v27/theme_light.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values-w820dp/dimens.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/attrs_room_message_colors.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/attrs_social_login_button.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/bools.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/colors.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/colors_password_strength.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/dimens.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/integers.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/palette.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/palette_mobile.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_badge_floating_action_button.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_bottom_sheet_action.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_button_state_view.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_max_height_scroll_view.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_pool_result_line.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_reaction_button.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_social_login_button_view.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/stylable_wizard_button_view.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/style_snackbar.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_alert_dialog.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_attachments.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_bottom_navigation.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_bottom_sheet.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_buttons.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_dial_pad.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_edit_text.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_label.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_login.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_pin_code.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_popup.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_progress.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_search_view.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_social_login.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_text_view.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_timeline.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/styles_toolbar.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/text_appearances.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/theme_black.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/theme_common.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/theme_dark.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/values/theme_light.xml (100%)

diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index f1e2972b95..f3e9ee9991 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -51,4 +51,8 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
+    // Pref theme
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    // PFLockScreen attrs
+    implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
 }
\ No newline at end of file
diff --git a/vector/src/main/res/transition/image_preview_transition.xml b/library/ui-styles/src/main/res/transition/image_preview_transition.xml
similarity index 100%
rename from vector/src/main/res/transition/image_preview_transition.xml
rename to library/ui-styles/src/main/res/transition/image_preview_transition.xml
diff --git a/vector/src/main/res/values-land/dimens.xml b/library/ui-styles/src/main/res/values-land/dimens.xml
similarity index 100%
rename from vector/src/main/res/values-land/dimens.xml
rename to library/ui-styles/src/main/res/values-land/dimens.xml
diff --git a/vector/src/main/res/values-land/styles.xml b/library/ui-styles/src/main/res/values-land/styles.xml
similarity index 100%
rename from vector/src/main/res/values-land/styles.xml
rename to library/ui-styles/src/main/res/values-land/styles.xml
diff --git a/vector/src/main/res/values-land/styles_dial_pad.xml b/library/ui-styles/src/main/res/values-land/styles_dial_pad.xml
similarity index 100%
rename from vector/src/main/res/values-land/styles_dial_pad.xml
rename to library/ui-styles/src/main/res/values-land/styles_dial_pad.xml
diff --git a/vector/src/main/res/values-ldrtl/integers.xml b/library/ui-styles/src/main/res/values-ldrtl/integers.xml
similarity index 100%
rename from vector/src/main/res/values-ldrtl/integers.xml
rename to library/ui-styles/src/main/res/values-ldrtl/integers.xml
diff --git a/vector/src/main/res/values-sw600dp/dimens.xml b/library/ui-styles/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from vector/src/main/res/values-sw600dp/dimens.xml
rename to library/ui-styles/src/main/res/values-sw600dp/dimens.xml
diff --git a/vector/src/main/res/values-v23/theme_black.xml b/library/ui-styles/src/main/res/values-v23/theme_black.xml
similarity index 100%
rename from vector/src/main/res/values-v23/theme_black.xml
rename to library/ui-styles/src/main/res/values-v23/theme_black.xml
diff --git a/vector/src/main/res/values-v23/theme_dark.xml b/library/ui-styles/src/main/res/values-v23/theme_dark.xml
similarity index 100%
rename from vector/src/main/res/values-v23/theme_dark.xml
rename to library/ui-styles/src/main/res/values-v23/theme_dark.xml
diff --git a/vector/src/main/res/values-v23/theme_light.xml b/library/ui-styles/src/main/res/values-v23/theme_light.xml
similarity index 100%
rename from vector/src/main/res/values-v23/theme_light.xml
rename to library/ui-styles/src/main/res/values-v23/theme_light.xml
diff --git a/vector/src/main/res/values-v27/theme_black.xml b/library/ui-styles/src/main/res/values-v27/theme_black.xml
similarity index 100%
rename from vector/src/main/res/values-v27/theme_black.xml
rename to library/ui-styles/src/main/res/values-v27/theme_black.xml
diff --git a/vector/src/main/res/values-v27/theme_dark.xml b/library/ui-styles/src/main/res/values-v27/theme_dark.xml
similarity index 100%
rename from vector/src/main/res/values-v27/theme_dark.xml
rename to library/ui-styles/src/main/res/values-v27/theme_dark.xml
diff --git a/vector/src/main/res/values-v27/theme_light.xml b/library/ui-styles/src/main/res/values-v27/theme_light.xml
similarity index 100%
rename from vector/src/main/res/values-v27/theme_light.xml
rename to library/ui-styles/src/main/res/values-v27/theme_light.xml
diff --git a/vector/src/main/res/values-w820dp/dimens.xml b/library/ui-styles/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from vector/src/main/res/values-w820dp/dimens.xml
rename to library/ui-styles/src/main/res/values-w820dp/dimens.xml
diff --git a/vector/src/main/res/values/attrs_room_message_colors.xml b/library/ui-styles/src/main/res/values/attrs_room_message_colors.xml
similarity index 100%
rename from vector/src/main/res/values/attrs_room_message_colors.xml
rename to library/ui-styles/src/main/res/values/attrs_room_message_colors.xml
diff --git a/vector/src/main/res/values/attrs_social_login_button.xml b/library/ui-styles/src/main/res/values/attrs_social_login_button.xml
similarity index 100%
rename from vector/src/main/res/values/attrs_social_login_button.xml
rename to library/ui-styles/src/main/res/values/attrs_social_login_button.xml
diff --git a/vector/src/main/res/values/bools.xml b/library/ui-styles/src/main/res/values/bools.xml
similarity index 100%
rename from vector/src/main/res/values/bools.xml
rename to library/ui-styles/src/main/res/values/bools.xml
diff --git a/vector/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
similarity index 100%
rename from vector/src/main/res/values/colors.xml
rename to library/ui-styles/src/main/res/values/colors.xml
diff --git a/vector/src/main/res/values/colors_password_strength.xml b/library/ui-styles/src/main/res/values/colors_password_strength.xml
similarity index 100%
rename from vector/src/main/res/values/colors_password_strength.xml
rename to library/ui-styles/src/main/res/values/colors_password_strength.xml
diff --git a/vector/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
similarity index 100%
rename from vector/src/main/res/values/dimens.xml
rename to library/ui-styles/src/main/res/values/dimens.xml
diff --git a/vector/src/main/res/values/integers.xml b/library/ui-styles/src/main/res/values/integers.xml
similarity index 100%
rename from vector/src/main/res/values/integers.xml
rename to library/ui-styles/src/main/res/values/integers.xml
diff --git a/vector/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
similarity index 100%
rename from vector/src/main/res/values/palette.xml
rename to library/ui-styles/src/main/res/values/palette.xml
diff --git a/vector/src/main/res/values/palette_mobile.xml b/library/ui-styles/src/main/res/values/palette_mobile.xml
similarity index 100%
rename from vector/src/main/res/values/palette_mobile.xml
rename to library/ui-styles/src/main/res/values/palette_mobile.xml
diff --git a/vector/src/main/res/values/stylable_badge_floating_action_button.xml b/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_badge_floating_action_button.xml
rename to library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
diff --git a/vector/src/main/res/values/stylable_bottom_sheet_action.xml b/library/ui-styles/src/main/res/values/stylable_bottom_sheet_action.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_bottom_sheet_action.xml
rename to library/ui-styles/src/main/res/values/stylable_bottom_sheet_action.xml
diff --git a/vector/src/main/res/values/stylable_button_state_view.xml b/library/ui-styles/src/main/res/values/stylable_button_state_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_button_state_view.xml
rename to library/ui-styles/src/main/res/values/stylable_button_state_view.xml
diff --git a/vector/src/main/res/values/stylable_max_height_scroll_view.xml b/library/ui-styles/src/main/res/values/stylable_max_height_scroll_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_max_height_scroll_view.xml
rename to library/ui-styles/src/main/res/values/stylable_max_height_scroll_view.xml
diff --git a/vector/src/main/res/values/stylable_pool_result_line.xml b/library/ui-styles/src/main/res/values/stylable_pool_result_line.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_pool_result_line.xml
rename to library/ui-styles/src/main/res/values/stylable_pool_result_line.xml
diff --git a/vector/src/main/res/values/stylable_reaction_button.xml b/library/ui-styles/src/main/res/values/stylable_reaction_button.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_reaction_button.xml
rename to library/ui-styles/src/main/res/values/stylable_reaction_button.xml
diff --git a/vector/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml b/library/ui-styles/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml
rename to library/ui-styles/src/main/res/values/stylable_sign_out_bottom_sheet_action_button.xml
diff --git a/vector/src/main/res/values/stylable_social_login_button_view.xml b/library/ui-styles/src/main/res/values/stylable_social_login_button_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_social_login_button_view.xml
rename to library/ui-styles/src/main/res/values/stylable_social_login_button_view.xml
diff --git a/vector/src/main/res/values/stylable_wizard_button_view.xml b/library/ui-styles/src/main/res/values/stylable_wizard_button_view.xml
similarity index 100%
rename from vector/src/main/res/values/stylable_wizard_button_view.xml
rename to library/ui-styles/src/main/res/values/stylable_wizard_button_view.xml
diff --git a/vector/src/main/res/values/style_snackbar.xml b/library/ui-styles/src/main/res/values/style_snackbar.xml
similarity index 100%
rename from vector/src/main/res/values/style_snackbar.xml
rename to library/ui-styles/src/main/res/values/style_snackbar.xml
diff --git a/vector/src/main/res/values/styles.xml b/library/ui-styles/src/main/res/values/styles.xml
similarity index 100%
rename from vector/src/main/res/values/styles.xml
rename to library/ui-styles/src/main/res/values/styles.xml
diff --git a/vector/src/main/res/values/styles_alert_dialog.xml b/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
similarity index 100%
rename from vector/src/main/res/values/styles_alert_dialog.xml
rename to library/ui-styles/src/main/res/values/styles_alert_dialog.xml
diff --git a/vector/src/main/res/values/styles_attachments.xml b/library/ui-styles/src/main/res/values/styles_attachments.xml
similarity index 100%
rename from vector/src/main/res/values/styles_attachments.xml
rename to library/ui-styles/src/main/res/values/styles_attachments.xml
diff --git a/vector/src/main/res/values/styles_bottom_navigation.xml b/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
similarity index 100%
rename from vector/src/main/res/values/styles_bottom_navigation.xml
rename to library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
diff --git a/vector/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
similarity index 100%
rename from vector/src/main/res/values/styles_bottom_sheet.xml
rename to library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
diff --git a/vector/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
similarity index 100%
rename from vector/src/main/res/values/styles_buttons.xml
rename to library/ui-styles/src/main/res/values/styles_buttons.xml
diff --git a/vector/src/main/res/values/styles_dial_pad.xml b/library/ui-styles/src/main/res/values/styles_dial_pad.xml
similarity index 100%
rename from vector/src/main/res/values/styles_dial_pad.xml
rename to library/ui-styles/src/main/res/values/styles_dial_pad.xml
diff --git a/vector/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
similarity index 100%
rename from vector/src/main/res/values/styles_edit_text.xml
rename to library/ui-styles/src/main/res/values/styles_edit_text.xml
diff --git a/vector/src/main/res/values/styles_label.xml b/library/ui-styles/src/main/res/values/styles_label.xml
similarity index 100%
rename from vector/src/main/res/values/styles_label.xml
rename to library/ui-styles/src/main/res/values/styles_label.xml
diff --git a/vector/src/main/res/values/styles_login.xml b/library/ui-styles/src/main/res/values/styles_login.xml
similarity index 100%
rename from vector/src/main/res/values/styles_login.xml
rename to library/ui-styles/src/main/res/values/styles_login.xml
diff --git a/vector/src/main/res/values/styles_pin_code.xml b/library/ui-styles/src/main/res/values/styles_pin_code.xml
similarity index 100%
rename from vector/src/main/res/values/styles_pin_code.xml
rename to library/ui-styles/src/main/res/values/styles_pin_code.xml
diff --git a/vector/src/main/res/values/styles_popup.xml b/library/ui-styles/src/main/res/values/styles_popup.xml
similarity index 100%
rename from vector/src/main/res/values/styles_popup.xml
rename to library/ui-styles/src/main/res/values/styles_popup.xml
diff --git a/vector/src/main/res/values/styles_progress.xml b/library/ui-styles/src/main/res/values/styles_progress.xml
similarity index 100%
rename from vector/src/main/res/values/styles_progress.xml
rename to library/ui-styles/src/main/res/values/styles_progress.xml
diff --git a/vector/src/main/res/values/styles_search_view.xml b/library/ui-styles/src/main/res/values/styles_search_view.xml
similarity index 100%
rename from vector/src/main/res/values/styles_search_view.xml
rename to library/ui-styles/src/main/res/values/styles_search_view.xml
diff --git a/vector/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
similarity index 100%
rename from vector/src/main/res/values/styles_social_login.xml
rename to library/ui-styles/src/main/res/values/styles_social_login.xml
diff --git a/vector/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
similarity index 100%
rename from vector/src/main/res/values/styles_text_view.xml
rename to library/ui-styles/src/main/res/values/styles_text_view.xml
diff --git a/vector/src/main/res/values/styles_timeline.xml b/library/ui-styles/src/main/res/values/styles_timeline.xml
similarity index 100%
rename from vector/src/main/res/values/styles_timeline.xml
rename to library/ui-styles/src/main/res/values/styles_timeline.xml
diff --git a/vector/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
similarity index 100%
rename from vector/src/main/res/values/styles_toolbar.xml
rename to library/ui-styles/src/main/res/values/styles_toolbar.xml
diff --git a/vector/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
similarity index 100%
rename from vector/src/main/res/values/text_appearances.xml
rename to library/ui-styles/src/main/res/values/text_appearances.xml
diff --git a/vector/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
similarity index 100%
rename from vector/src/main/res/values/theme_black.xml
rename to library/ui-styles/src/main/res/values/theme_black.xml
diff --git a/vector/src/main/res/values/theme_common.xml b/library/ui-styles/src/main/res/values/theme_common.xml
similarity index 100%
rename from vector/src/main/res/values/theme_common.xml
rename to library/ui-styles/src/main/res/values/theme_common.xml
diff --git a/vector/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
similarity index 100%
rename from vector/src/main/res/values/theme_dark.xml
rename to library/ui-styles/src/main/res/values/theme_dark.xml
diff --git a/vector/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
similarity index 100%
rename from vector/src/main/res/values/theme_light.xml
rename to library/ui-styles/src/main/res/values/theme_light.xml

From 52f0d8a1d2ada1f65c67bb452decec09d93e854a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 11 Jun 2021 09:23:13 +0200
Subject: [PATCH 27/49] Add warning to private space creation flow

---
 newsfragment/3485.feature                     |  1 +
 .../features/spaces/SpaceCreationActivity.kt  | 59 ++++++++++++++-----
 .../spaces/create/BetaWarningBottomSheet.kt   | 52 ++++++++++++++++
 .../create/ChoosePrivateSpaceTypeFragment.kt  | 10 +++-
 .../spaces/create/CreateSpaceAction.kt        |  1 +
 .../spaces/create/CreateSpaceEvents.kt        |  1 +
 .../spaces/create/CreateSpaceViewModel.kt     |  3 +
 ...tom_sheet_space_create_private_warning.xml | 46 +++++++++++++++
 vector/src/main/res/values/strings.xml        |  4 ++
 9 files changed, 162 insertions(+), 15 deletions(-)
 create mode 100644 newsfragment/3485.feature
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
 create mode 100644 vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml

diff --git a/newsfragment/3485.feature b/newsfragment/3485.feature
new file mode 100644
index 0000000000..68c78267be
--- /dev/null
+++ b/newsfragment/3485.feature
@@ -0,0 +1 @@
+Add beta warning to private space creation flow
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 57c6b40404..dbcb9fd5bf 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.viewModel
 import com.airbnb.mvrx.withState
@@ -28,6 +29,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.spaces.create.BetaWarningBottomSheet
 import im.vector.app.features.spaces.create.ChoosePrivateSpaceTypeFragment
 import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
 import im.vector.app.features.spaces.create.CreateSpaceAction
@@ -40,7 +42,7 @@ import im.vector.app.features.spaces.create.SpaceTopology
 import im.vector.app.features.spaces.create.SpaceType
 import javax.inject.Inject
 
-class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Factory {
+class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Factory, BetaWarningBottomSheet.InteractionListener {
 
     @Inject lateinit var viewModelFactory: CreateSpaceViewModel.Factory
 
@@ -51,18 +53,38 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
 
     val viewModel: CreateSpaceViewModel by viewModel()
 
+    private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
+        override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
+            when (f) {
+                is BetaWarningBottomSheet -> {
+                    f.interactionListener = this@SpaceCreationActivity
+                }
+            }
+            super.onFragmentAttached(fm, f, context)
+        }
+
+        override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
+            when (f) {
+                is BetaWarningBottomSheet -> {
+                    f.interactionListener = null
+                }
+            }
+            super.onFragmentDetached(fm, f)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
         if (isFirstCreation()) {
             when (withState(viewModel) { it.step }) {
-                CreateSpaceState.Step.ChooseType -> {
+                CreateSpaceState.Step.ChooseType        -> {
                     navigateToFragment(ChooseSpaceTypeFragment::class.java)
                 }
-                CreateSpaceState.Step.SetDetails -> {
+                CreateSpaceState.Step.SetDetails        -> {
                     navigateToFragment(ChooseSpaceTypeFragment::class.java)
                 }
-                CreateSpaceState.Step.AddRooms -> {
+                CreateSpaceState.Step.AddRooms          -> {
                     navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
                 }
                 CreateSpaceState.Step.ChoosePrivateType -> {
@@ -72,6 +94,11 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
         }
     }
 
+    override fun onDestroy() {
+        supportFragmentManager.unregisterFragmentLifecycleCallbacks(fragmentLifecycleCallbacks)
+        super.onDestroy()
+    }
+
     override fun initUiAndData() {
         super.initUiAndData()
 
@@ -81,29 +108,29 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
 
         viewModel.observeViewEvents {
             when (it) {
-                CreateSpaceEvents.NavigateToDetails -> {
+                CreateSpaceEvents.NavigateToDetails           -> {
                     navigateToFragment(CreateSpaceDetailsFragment::class.java)
                 }
-                CreateSpaceEvents.NavigateToChooseType -> {
+                CreateSpaceEvents.NavigateToChooseType        -> {
                     navigateToFragment(ChooseSpaceTypeFragment::class.java)
                 }
-                CreateSpaceEvents.Dismiss -> {
+                CreateSpaceEvents.Dismiss                     -> {
                     finish()
                 }
-                CreateSpaceEvents.NavigateToAddRooms -> {
+                CreateSpaceEvents.NavigateToAddRooms          -> {
                     navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
                 }
                 CreateSpaceEvents.NavigateToChoosePrivateType -> {
                     navigateToFragment(ChoosePrivateSpaceTypeFragment::class.java)
                 }
-                is CreateSpaceEvents.ShowModalError -> {
+                is CreateSpaceEvents.ShowModalError           -> {
                     hideWaitingView()
                     MaterialAlertDialogBuilder(this)
                             .setMessage(it.errorMessage)
                             .setPositiveButton(getString(R.string.ok), null)
                             .show()
                 }
-                is CreateSpaceEvents.FinishSuccess -> {
+                is CreateSpaceEvents.FinishSuccess            -> {
                     setResult(RESULT_OK, Intent().apply {
                         putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId)
                         putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId)
@@ -111,7 +138,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                     })
                     finish()
                 }
-                CreateSpaceEvents.HideModalLoading -> {
+                CreateSpaceEvents.HideModalLoading            -> {
                     hideWaitingView()
                 }
             }
@@ -135,9 +162,9 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
 
     private fun renderState(state: CreateSpaceState) {
         val titleRes = when (state.step) {
-            CreateSpaceState.Step.ChooseType -> R.string.activity_create_space_title
+            CreateSpaceState.Step.ChooseType        -> R.string.activity_create_space_title
             CreateSpaceState.Step.SetDetails,
-            CreateSpaceState.Step.AddRooms -> {
+            CreateSpaceState.Step.AddRooms          -> {
                 if (state.spaceType == SpaceType.Public) R.string.your_public_space
                 else R.string.your_private_space
             }
@@ -179,4 +206,8 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
     }
 
     override fun create(initialState: CreateSpaceState): CreateSpaceViewModel = viewModelFactory.create(initialState)
+
+    override fun betaWarningOnContinueAnyway() {
+        viewModel.handle(CreateSpaceAction.ConfirmBetaWarning)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
new file mode 100644
index 0000000000..82e8721b07
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetSpaceCreatePrivateWarningBinding
+
+class BetaWarningBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceCreatePrivateWarningBinding>() {
+
+    interface InteractionListener {
+        fun betaWarningOnContinueAnyway()
+    }
+
+    var interactionListener: InteractionListener? = null
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            BottomSheetSpaceCreatePrivateWarningBinding.inflate(inflater, container, false)
+
+    override val showExpanded = true
+
+    override fun onDetach() {
+        interactionListener = null
+        super.onDetach()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        views.continueButton.debouncedClicks {
+            interactionListener?.betaWarningOnContinueAnyway()
+            dismiss()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
index 4f079551eb..49fe9a7dec 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
@@ -46,12 +46,20 @@ class ChoosePrivateSpaceTypeFragment @Inject constructor(
         }
 
         views.teammatesButton.onClick {
-            sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.MeAndTeammates))
+            BetaWarningBottomSheet().show(parentFragmentManager, "warning")
         }
 
         sharedViewModel.subscribe { state ->
             views.accessInfoHelpText.text = stringProvider.getString(R.string.create_spaces_make_sure_access, state.name ?: "")
         }
+
+        sharedViewModel.observeViewEvents {
+            when (it) {
+                CreateSpaceEvents.OnConfirmBetaWarning -> {
+                    sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.MeAndTeammates))
+                }
+            }
+        }
     }
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
index cd31b40354..291679764f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
@@ -29,4 +29,5 @@ sealed class CreateSpaceAction : VectorViewModelAction {
     object NextFromDefaultRooms : CreateSpaceAction()
     data class DefaultRoomNameChanged(val index: Int, val name: String) : CreateSpaceAction()
     data class SetSpaceTopology(val topology: SpaceTopology) : CreateSpaceAction()
+    object ConfirmBetaWarning : CreateSpaceAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
index c3fa2b2068..3e40fc6ad7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
@@ -27,4 +27,5 @@ sealed class CreateSpaceEvents : VectorViewEvents {
     data class FinishSuccess(val spaceId: String, val defaultRoomId: String?, val topology: SpaceTopology?) : CreateSpaceEvents()
     data class ShowModalError(val errorMessage: String) : CreateSpaceEvents()
     object HideModalLoading : CreateSpaceEvents()
+    object OnConfirmBetaWarning : CreateSpaceEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index 9881232f4d..3da6a7554f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -118,6 +118,9 @@ class CreateSpaceViewModel @AssistedInject constructor(
             is CreateSpaceAction.SetSpaceTopology -> {
                 handleSetTopology(action)
             }
+            CreateSpaceAction.ConfirmBetaWarning        -> {
+                _viewEvents.post(CreateSpaceEvents.OnConfirmBetaWarning)
+            }
         }.exhaustive
     }
 
diff --git a/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml b/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml
new file mode 100644
index 0000000000..7292c7df55
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorSurface"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="12dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_beta_pill" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="12dp"
+        android:gravity="center"
+        android:text="@string/teammate_spaces_arent_quite_ready"
+        android:textColor="?vctr_content_primary"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:gravity="center"
+        android:text="@string/teammate_spaces_might_not_join"
+        android:textColor="?vctr_content_secondary"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/continueButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/layout_vertical_margin"
+        android:text="@string/continue_anyway"
+        android:textAllCaps="true" />
+
+</LinearLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 80120b51bf..621ecb7aee 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -771,6 +771,7 @@
     <string name="yes">YES</string>
     <string name="no">NO</string>
     <string name="_continue">Continue</string>
+    <string name="continue_anyway">Continue Anyway</string>
 
     <!-- Actions -->
     <string name="remove">Remove</string>
@@ -3399,4 +3400,7 @@
     <string name="this_space_has_no_rooms_admin">Some rooms may be hidden because they’re private and you need an invite.</string>
 
     <string name="unnamed_room">Unnamed Room</string>
+
+    <string name="teammate_spaces_arent_quite_ready">"Teammate spaces aren’t quite ready but you can still give them a try"</string>
+    <string name="teammate_spaces_might_not_join">"At the moment people might not be able to join any private rooms you make.\n\nWe’ll be improving this as part of the beta, but just wanted to let you know."</string>
 </resources>

From bc120da985dc0f9159a90d557447c7ff406df554 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 15 Jun 2021 09:48:45 +0200
Subject: [PATCH 28/49] Code review cleaning

---
 .../features/spaces/SpaceCreationActivity.kt  | 34 +------------------
 .../spaces/create/BetaWarningBottomSheet.kt   | 18 ++++------
 .../create/ChoosePrivateSpaceTypeFragment.kt  | 16 ++++-----
 .../spaces/create/CreateSpaceAction.kt        |  1 -
 .../spaces/create/CreateSpaceEvents.kt        |  1 -
 .../spaces/create/CreateSpaceViewModel.kt     | 31 ++++++++---------
 6 files changed, 29 insertions(+), 72 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index dbcb9fd5bf..6bf31dd5ce 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.viewModel
 import com.airbnb.mvrx.withState
@@ -29,7 +28,6 @@ import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.SimpleFragmentActivity
-import im.vector.app.features.spaces.create.BetaWarningBottomSheet
 import im.vector.app.features.spaces.create.ChoosePrivateSpaceTypeFragment
 import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
 import im.vector.app.features.spaces.create.CreateSpaceAction
@@ -42,7 +40,7 @@ import im.vector.app.features.spaces.create.SpaceTopology
 import im.vector.app.features.spaces.create.SpaceType
 import javax.inject.Inject
 
-class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Factory, BetaWarningBottomSheet.InteractionListener {
+class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Factory {
 
     @Inject lateinit var viewModelFactory: CreateSpaceViewModel.Factory
 
@@ -53,29 +51,8 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
 
     val viewModel: CreateSpaceViewModel by viewModel()
 
-    private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
-        override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
-            when (f) {
-                is BetaWarningBottomSheet -> {
-                    f.interactionListener = this@SpaceCreationActivity
-                }
-            }
-            super.onFragmentAttached(fm, f, context)
-        }
-
-        override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
-            when (f) {
-                is BetaWarningBottomSheet -> {
-                    f.interactionListener = null
-                }
-            }
-            super.onFragmentDetached(fm, f)
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
         if (isFirstCreation()) {
             when (withState(viewModel) { it.step }) {
                 CreateSpaceState.Step.ChooseType        -> {
@@ -94,11 +71,6 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
         }
     }
 
-    override fun onDestroy() {
-        supportFragmentManager.unregisterFragmentLifecycleCallbacks(fragmentLifecycleCallbacks)
-        super.onDestroy()
-    }
-
     override fun initUiAndData() {
         super.initUiAndData()
 
@@ -206,8 +178,4 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
     }
 
     override fun create(initialState: CreateSpaceState): CreateSpaceViewModel = viewModelFactory.create(initialState)
-
-    override fun betaWarningOnContinueAnyway() {
-        viewModel.handle(CreateSpaceAction.ConfirmBetaWarning)
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
index 82e8721b07..fc3d98e6b8 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/BetaWarningBottomSheet.kt
@@ -20,33 +20,27 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.setFragmentResult
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetSpaceCreatePrivateWarningBinding
 
 class BetaWarningBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceCreatePrivateWarningBinding>() {
 
-    interface InteractionListener {
-        fun betaWarningOnContinueAnyway()
-    }
-
-    var interactionListener: InteractionListener? = null
-
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             BottomSheetSpaceCreatePrivateWarningBinding.inflate(inflater, container, false)
 
     override val showExpanded = true
 
-    override fun onDetach() {
-        interactionListener = null
-        super.onDetach()
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         views.continueButton.debouncedClicks {
-            interactionListener?.betaWarningOnContinueAnyway()
+            setFragmentResult(REQUEST_KEY, Bundle.EMPTY)
             dismiss()
         }
     }
+
+    companion object {
+        const val REQUEST_KEY = "BetaWarningBottomSheet"
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
index 49fe9a7dec..4031b56c1d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.setFragmentResultListener
 import com.airbnb.mvrx.activityViewModel
 import im.vector.app.R
 import im.vector.app.core.epoxy.onClick
@@ -38,6 +39,13 @@ class ChoosePrivateSpaceTypeFragment @Inject constructor(
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentSpaceCreateChoosePrivateModelBinding.inflate(layoutInflater, container, false)
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setFragmentResultListener(BetaWarningBottomSheet.REQUEST_KEY) { _, _ ->
+            sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.MeAndTeammates))
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -52,14 +60,6 @@ class ChoosePrivateSpaceTypeFragment @Inject constructor(
         sharedViewModel.subscribe { state ->
             views.accessInfoHelpText.text = stringProvider.getString(R.string.create_spaces_make_sure_access, state.name ?: "")
         }
-
-        sharedViewModel.observeViewEvents {
-            when (it) {
-                CreateSpaceEvents.OnConfirmBetaWarning -> {
-                    sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.MeAndTeammates))
-                }
-            }
-        }
     }
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
index 291679764f..cd31b40354 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
@@ -29,5 +29,4 @@ sealed class CreateSpaceAction : VectorViewModelAction {
     object NextFromDefaultRooms : CreateSpaceAction()
     data class DefaultRoomNameChanged(val index: Int, val name: String) : CreateSpaceAction()
     data class SetSpaceTopology(val topology: SpaceTopology) : CreateSpaceAction()
-    object ConfirmBetaWarning : CreateSpaceAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
index 3e40fc6ad7..c3fa2b2068 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
@@ -27,5 +27,4 @@ sealed class CreateSpaceEvents : VectorViewEvents {
     data class FinishSuccess(val spaceId: String, val defaultRoomId: String?, val topology: SpaceTopology?) : CreateSpaceEvents()
     data class ShowModalError(val errorMessage: String) : CreateSpaceEvents()
     object HideModalLoading : CreateSpaceEvents()
-    object OnConfirmBetaWarning : CreateSpaceEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index 3da6a7554f..aff342cea7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -70,7 +70,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
 
     override fun handle(action: CreateSpaceAction) {
         when (action) {
-            is CreateSpaceAction.SetRoomType -> {
+            is CreateSpaceAction.SetRoomType            -> {
                 setState {
                     copy(
                             step = CreateSpaceState.Step.SetDetails,
@@ -79,7 +79,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 }
                 _viewEvents.post(CreateSpaceEvents.NavigateToDetails)
             }
-            is CreateSpaceAction.NameChanged -> {
+            is CreateSpaceAction.NameChanged            -> {
                 setState {
                     copy(
                             nameInlineError = null,
@@ -87,20 +87,20 @@ class CreateSpaceViewModel @AssistedInject constructor(
                     )
                 }
             }
-            is CreateSpaceAction.TopicChanged -> {
+            is CreateSpaceAction.TopicChanged           -> {
                 setState {
                     copy(
                             topic = action.topic
                     )
                 }
             }
-            CreateSpaceAction.OnBackPressed -> {
+            CreateSpaceAction.OnBackPressed             -> {
                 handleBackNavigation()
             }
-            CreateSpaceAction.NextFromDetails -> {
+            CreateSpaceAction.NextFromDetails           -> {
                 handleNextFromDetails()
             }
-            CreateSpaceAction.NextFromDefaultRooms -> {
+            CreateSpaceAction.NextFromDefaultRooms      -> {
                 handleNextFromDefaultRooms()
             }
             is CreateSpaceAction.DefaultRoomNameChanged -> {
@@ -112,21 +112,18 @@ class CreateSpaceViewModel @AssistedInject constructor(
                     )
                 }
             }
-            is CreateSpaceAction.SetAvatar -> {
+            is CreateSpaceAction.SetAvatar              -> {
                 setState { copy(avatarUri = action.uri) }
             }
-            is CreateSpaceAction.SetSpaceTopology -> {
+            is CreateSpaceAction.SetSpaceTopology       -> {
                 handleSetTopology(action)
             }
-            CreateSpaceAction.ConfirmBetaWarning        -> {
-                _viewEvents.post(CreateSpaceEvents.OnConfirmBetaWarning)
-            }
         }.exhaustive
     }
 
     private fun handleSetTopology(action: CreateSpaceAction.SetSpaceTopology) {
         when (action.topology) {
-            SpaceTopology.JustMe -> {
+            SpaceTopology.JustMe         -> {
                 setState {
                     copy(
                             spaceTopology = SpaceTopology.JustMe,
@@ -149,10 +146,10 @@ class CreateSpaceViewModel @AssistedInject constructor(
 
     private fun handleBackNavigation() = withState { state ->
         when (state.step) {
-            CreateSpaceState.Step.ChooseType -> {
+            CreateSpaceState.Step.ChooseType        -> {
                 _viewEvents.post(CreateSpaceEvents.Dismiss)
             }
-            CreateSpaceState.Step.SetDetails -> {
+            CreateSpaceState.Step.SetDetails        -> {
                 setState {
                     copy(
                             step = CreateSpaceState.Step.ChooseType,
@@ -162,7 +159,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 }
                 _viewEvents.post(CreateSpaceEvents.NavigateToChooseType)
             }
-            CreateSpaceState.Step.AddRooms -> {
+            CreateSpaceState.Step.AddRooms          -> {
                 if (state.spaceType == SpaceType.Private && state.spaceTopology == SpaceTopology.MeAndTeammates) {
                     setState {
                         copy(
@@ -237,7 +234,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                         )
                 )
                 when (result) {
-                    is CreateSpaceTaskResult.Success -> {
+                    is CreateSpaceTaskResult.Success             -> {
                         setState {
                             copy(creationResult = Success(result.spaceId))
                         }
@@ -249,7 +246,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                                 )
                         )
                     }
-                    is CreateSpaceTaskResult.PartialSuccess -> {
+                    is CreateSpaceTaskResult.PartialSuccess      -> {
                         // XXX what can we do here?
                         setState {
                             copy(creationResult = Success(result.spaceId))

From bbbe76b91c09dae68c8560c11705d77a1d74d2dd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 14:48:45 +0200
Subject: [PATCH 29/49] Move test style Activity and layout to the new ui-style
 module

---
 library/ui-styles/build.gradle                |  3 ++
 .../ui-styles/src/debug/AndroidManifest.xml   | 29 +++++++++++++++++++
 .../lib/ui/styles}/debug/DebugBottomSheet.kt  |  4 +--
 .../debug/DebugMaterialThemeActivity.kt       | 14 ++++-----
 .../DebugMaterialThemeDarkDefaultActivity.kt  |  4 +--
 .../DebugMaterialThemeDarkTestActivity.kt     |  4 +--
 .../DebugMaterialThemeDarkVectorActivity.kt   |  4 +--
 .../DebugMaterialThemeLightDefaultActivity.kt |  4 +--
 .../DebugMaterialThemeLightTestActivity.kt    |  4 +--
 .../DebugMaterialThemeLightVectorActivity.kt  |  4 +--
 .../debug/DebugVectorButtonStylesActivity.kt  | 18 ++++++++----
 .../src/debug/res/drawable/ic_debug_icon.xml  | 22 ++++++++++++++
 .../src/debug/res/drawable/linear_divider.xml |  0
 .../layout/activity_debug_button_styles.xml   |  0
 .../layout/activity_test_material_theme.xml   | 20 ++++++-------
 .../src/debug/res/layout/debug_text_view.xml  |  0
 .../src/debug/res/menu/menu_debug.xml         | 19 ++++++++++++
 .../src/debug/res/values/debug_styles.xml     |  0
 .../ui-styles/src/main/AndroidManifest.xml    |  2 +-
 .../src/release/res/values/styles.xml         |  0
 vector/src/debug/AndroidManifest.xml          | 21 --------------
 .../app/features/debug/DebugMenuActivity.kt   |  7 +++++
 vector/src/debug/res/menu/menu_debug.xml      | 17 -----------
 23 files changed, 124 insertions(+), 76 deletions(-)
 create mode 100644 library/ui-styles/src/debug/AndroidManifest.xml
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugBottomSheet.kt (90%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugMaterialThemeActivity.kt (87%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugMaterialThemeDarkDefaultActivity.kt (89%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugMaterialThemeDarkTestActivity.kt (89%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugMaterialThemeDarkVectorActivity.kt (89%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugMaterialThemeLightDefaultActivity.kt (89%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugMaterialThemeLightTestActivity.kt (89%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugMaterialThemeLightVectorActivity.kt (89%)
 rename {vector/src/debug/java/im/vector/app/features => library/ui-styles/src/debug/java/im/vector/lib/ui/styles}/debug/DebugVectorButtonStylesActivity.kt (53%)
 create mode 100644 library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml
 rename {vector => library/ui-styles}/src/debug/res/drawable/linear_divider.xml (100%)
 rename {vector => library/ui-styles}/src/debug/res/layout/activity_debug_button_styles.xml (100%)
 rename {vector => library/ui-styles}/src/debug/res/layout/activity_test_material_theme.xml (97%)
 rename {vector => library/ui-styles}/src/debug/res/layout/debug_text_view.xml (100%)
 create mode 100644 library/ui-styles/src/debug/res/menu/menu_debug.xml
 rename {vector => library/ui-styles}/src/debug/res/values/debug_styles.xml (100%)
 rename {vector => library/ui-styles}/src/release/res/values/styles.xml (100%)
 delete mode 100644 vector/src/debug/res/menu/menu_debug.xml

diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index f3e9ee9991..8010786a17 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -46,6 +46,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
diff --git a/library/ui-styles/src/debug/AndroidManifest.xml b/library/ui-styles/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000000..b0c32f3975
--- /dev/null
+++ b/library/ui-styles/src/debug/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="im.vector.lib.ui.styles">
+
+    <application>
+        <activity
+            android:name=".debug.DebugMaterialThemeLightDefaultActivity"
+            android:theme="@style/VectorMaterialThemeDebugLight" />
+        <activity
+            android:name=".debug.DebugMaterialThemeLightTestActivity"
+            android:theme="@style/VectorMaterialThemeDebugLight.Test" />
+        <activity
+            android:name=".debug.DebugMaterialThemeLightVectorActivity"
+            android:theme="@style/AppTheme.Light" />
+        <activity
+            android:name=".debug.DebugMaterialThemeDarkDefaultActivity"
+            android:theme="@style/VectorMaterialThemeDebugDark" />
+        <activity
+            android:name=".debug.DebugMaterialThemeDarkTestActivity"
+            android:theme="@style/VectorMaterialThemeDebugDark.Test" />
+        <activity
+            android:name=".debug.DebugMaterialThemeDarkVectorActivity"
+            android:theme="@style/AppTheme.Dark" />
+        <activity
+            android:name=".debug.DebugVectorButtonStylesActivity"
+            android:theme="@style/AppTheme.Light" />
+    </application>
+
+</manifest>
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugBottomSheet.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt
similarity index 90%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugBottomSheet.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt
index 0ac9a894ae..f5f69b1db4 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugBottomSheet.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import im.vector.app.databinding.ActivityTestMaterialThemeBinding
+import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
 
 class DebugBottomSheet : BottomSheetDialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt
similarity index 87%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt
index 69dc683bf3..492b359105 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 import android.os.Bundle
 import android.view.Menu
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import im.vector.app.R
-import im.vector.app.core.utils.toast
-import im.vector.app.databinding.ActivityTestMaterialThemeBinding
+import im.vector.lib.ui.styles.R
+import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
 
 // Rendering is not the same with VectorBaseActivity
 abstract class DebugMaterialThemeActivity : AppCompatActivity() {
@@ -46,14 +46,14 @@ abstract class DebugMaterialThemeActivity : AppCompatActivity() {
         }
 
         views.debugShowToast.setOnClickListener {
-            toast("Toast")
+            Toast.makeText(this, "Toast", Toast.LENGTH_SHORT).show()
         }
 
         views.debugShowDialog.setOnClickListener {
             MaterialAlertDialogBuilder(this)
                     .setTitle("Dialog title")
                     .setMessage("Dialog content")
-                    .setIcon(R.drawable.ic_settings_x)
+                    .setIcon(R.drawable.ic_debug_icon)
                     .setPositiveButton("Positive", null)
                     .setNegativeButton("Negative", null)
                     .setNeutralButton("Neutral", null)
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkDefaultActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkDefaultActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkDefaultActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkDefaultActivity.kt
index 7e014577de..d24ceb6ede 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkDefaultActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkDefaultActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeDarkDefaultActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkTestActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkTestActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkTestActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkTestActivity.kt
index 4a1ed04f6a..fea1f27dae 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkTestActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkTestActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeDarkTestActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkVectorActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkVectorActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkVectorActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkVectorActivity.kt
index 6ac27aed45..379d55d006 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkVectorActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkVectorActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeDarkVectorActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightDefaultActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightDefaultActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightDefaultActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightDefaultActivity.kt
index f6327e363b..57f172bdc3 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightDefaultActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightDefaultActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeLightDefaultActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightTestActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightTestActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightTestActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightTestActivity.kt
index ae6c1dd68c..d3a6c757fb 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightTestActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightTestActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeLightTestActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightVectorActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightVectorActivity.kt
similarity index 89%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightVectorActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightVectorActivity.kt
index b4fb3c1cc8..3fafa61421 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightVectorActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightVectorActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
 class DebugMaterialThemeLightVectorActivity : DebugMaterialThemeActivity()
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugVectorButtonStylesActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
similarity index 53%
rename from vector/src/debug/java/im/vector/app/features/debug/DebugVectorButtonStylesActivity.kt
rename to library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
index 783a2a3eb5..55c86d6c80 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugVectorButtonStylesActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.debug
+package im.vector.lib.ui.styles.debug
 
-import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivityDebugButtonStylesBinding
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import im.vector.lib.ui.styles.databinding.ActivityDebugButtonStylesBinding
 
-class DebugVectorButtonStylesActivity : VectorBaseActivity<ActivityDebugButtonStylesBinding>() {
-    override fun getBinding() = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
+class DebugVectorButtonStylesActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val views = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
+        setContentView(views.root)
+    }
 }
diff --git a/library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml b/library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml
new file mode 100644
index 0000000000..08af7d6539
--- /dev/null
+++ b/library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,10m-2.455,0a2.455,2.455 0,1 1,4.91 0a2.455,2.455 0,1 1,-4.91 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#454545"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.055,12.455a1.35,1.35 0,0 0,0.27 1.489l0.049,0.049a1.636,1.636 0,1 1,-2.316 2.315l-0.049,-0.049a1.35,1.35 0,0 0,-1.489 -0.27,1.35 1.35,0 0,0 -0.818,1.236v0.139a1.636,1.636 0,0 1,-3.273 0v-0.074a1.35,1.35 0,0 0,-0.884 -1.235,1.35 1.35,0 0,0 -1.489,0.27l-0.049,0.049a1.636,1.636 0,1 1,-2.315 -2.316l0.049,-0.049a1.35,1.35 0,0 0,0.27 -1.489,1.35 1.35,0 0,0 -1.236,-0.818h-0.139a1.636,1.636 0,0 1,0 -3.273h0.074a1.35,1.35 0,0 0,1.235 -0.884,1.35 1.35,0 0,0 -0.27,-1.489l-0.049,-0.049a1.636,1.636 0,1 1,2.316 -2.315l0.049,0.049a1.35,1.35 0,0 0,1.489 0.27h0.065a1.35,1.35 0,0 0,0.819 -1.236v-0.139a1.636,1.636 0,0 1,3.272 0v0.074a1.35,1.35 0,0 0,0.819 1.235,1.35 1.35,0 0,0 1.489,-0.27l0.049,-0.049a1.636,1.636 0,1 1,2.315 2.316l-0.049,0.049a1.35,1.35 0,0 0,-0.27 1.489v0.065a1.35,1.35 0,0 0,1.236 0.819h0.139a1.636,1.636 0,0 1,0 3.272h-0.074a1.35,1.35 0,0 0,-1.235 0.819z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#454545"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/debug/res/drawable/linear_divider.xml b/library/ui-styles/src/debug/res/drawable/linear_divider.xml
similarity index 100%
rename from vector/src/debug/res/drawable/linear_divider.xml
rename to library/ui-styles/src/debug/res/drawable/linear_divider.xml
diff --git a/vector/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
similarity index 100%
rename from vector/src/debug/res/layout/activity_debug_button_styles.xml
rename to library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
diff --git a/vector/src/debug/res/layout/activity_test_material_theme.xml b/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
similarity index 97%
rename from vector/src/debug/res/layout/activity_test_material_theme.xml
rename to library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
index c228377b98..20ad972096 100644
--- a/vector/src/debug/res/layout/activity_test_material_theme.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
@@ -330,7 +330,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="Classic"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button"
@@ -338,14 +338,14 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="Classic Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="OutlinedButton"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@@ -353,14 +353,14 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="OutlinedButton Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="TextButton"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -368,14 +368,14 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="TextButton Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="UnelevatedButton"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <Button
                     style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
@@ -383,7 +383,7 @@
                     android:layout_height="wrap_content"
                     android:enabled="false"
                     android:text="UnelevatedButton Disabled"
-                    app:icon="@drawable/ic_settings_x" />
+                    app:icon="@drawable/ic_debug_icon" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -457,12 +457,12 @@
                     android:layout_gravity="end"
                     android:layout_margin="16dp"
                     android:importantForAccessibility="no"
-                    android:src="@drawable/ic_settings_x" />
+                    android:src="@drawable/ic_debug_icon" />
 
                 <com.google.android.material.bottomnavigation.BottomNavigationView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:menu="@menu/home_bottom_navigation" />
+                    app:menu="@menu/menu_debug" />
 
             </LinearLayout>
 
diff --git a/vector/src/debug/res/layout/debug_text_view.xml b/library/ui-styles/src/debug/res/layout/debug_text_view.xml
similarity index 100%
rename from vector/src/debug/res/layout/debug_text_view.xml
rename to library/ui-styles/src/debug/res/layout/debug_text_view.xml
diff --git a/library/ui-styles/src/debug/res/menu/menu_debug.xml b/library/ui-styles/src/debug/res/menu/menu_debug.xml
new file mode 100644
index 0000000000..c58a29db8f
--- /dev/null
+++ b/library/ui-styles/src/debug/res/menu/menu_debug.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="HardcodedText">
+
+    <item
+        android:id="@+id/menuDebug1"
+        android:icon="@drawable/ic_debug_icon"
+        android:title="Edit"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menuDebug2"
+        android:icon="@drawable/ic_debug_icon"
+        android:title="Send"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/vector/src/debug/res/values/debug_styles.xml b/library/ui-styles/src/debug/res/values/debug_styles.xml
similarity index 100%
rename from vector/src/debug/res/values/debug_styles.xml
rename to library/ui-styles/src/debug/res/values/debug_styles.xml
diff --git a/library/ui-styles/src/main/AndroidManifest.xml b/library/ui-styles/src/main/AndroidManifest.xml
index a144066b26..19aa89e2e7 100644
--- a/library/ui-styles/src/main/AndroidManifest.xml
+++ b/library/ui-styles/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.app.ui.styles"/>
\ No newline at end of file
+<manifest package="im.vector.lib.ui.styles"/>
\ No newline at end of file
diff --git a/vector/src/release/res/values/styles.xml b/library/ui-styles/src/release/res/values/styles.xml
similarity index 100%
rename from vector/src/release/res/values/styles.xml
rename to library/ui-styles/src/release/res/values/styles.xml
diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml
index 95066bb44f..b97384099f 100644
--- a/vector/src/debug/AndroidManifest.xml
+++ b/vector/src/debug/AndroidManifest.xml
@@ -5,27 +5,6 @@
     <application>
         <activity android:name=".features.debug.TestLinkifyActivity" />
         <activity android:name=".features.debug.sas.DebugSasEmojiActivity" />
-        <activity
-            android:name=".features.debug.DebugMaterialThemeLightDefaultActivity"
-            android:theme="@style/VectorMaterialThemeDebugLight" />
-        <activity
-            android:name=".features.debug.DebugMaterialThemeLightTestActivity"
-            android:theme="@style/VectorMaterialThemeDebugLight.Test" />
-        <activity
-            android:name=".features.debug.DebugMaterialThemeLightVectorActivity"
-            android:theme="@style/AppTheme.Light" />
-        <activity
-            android:name=".features.debug.DebugMaterialThemeDarkDefaultActivity"
-            android:theme="@style/VectorMaterialThemeDebugDark" />
-        <activity
-            android:name=".features.debug.DebugMaterialThemeDarkTestActivity"
-            android:theme="@style/VectorMaterialThemeDebugDark.Test" />
-        <activity
-            android:name=".features.debug.DebugMaterialThemeDarkVectorActivity"
-            android:theme="@style/AppTheme.Dark" />
-        <activity
-            android:name=".features.debug.DebugVectorButtonStylesActivity"
-            android:theme="@style/AppTheme.Light" />
     </application>
 
 </manifest>
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 65a24c9aeb..90dccc0437 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -37,6 +37,13 @@ import im.vector.app.core.utils.toast
 import im.vector.app.databinding.ActivityDebugMenuBinding
 import im.vector.app.features.debug.sas.DebugSasEmojiActivity
 import im.vector.app.features.qrcode.QrCodeScannerActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkDefaultActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkTestActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkVectorActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightDefaultActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightTestActivity
+import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightVectorActivity
+import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesActivity
 import org.matrix.android.sdk.internal.crypto.verification.qrcode.toQrCodeData
 
 import timber.log.Timber
diff --git a/vector/src/debug/res/menu/menu_debug.xml b/vector/src/debug/res/menu/menu_debug.xml
deleted file mode 100644
index c4fdaa435d..0000000000
--- a/vector/src/debug/res/menu/menu_debug.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menuDebug1"
-        android:icon="@drawable/ic_edit"
-        android:title="@string/edit"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menuDebug2"
-        android:icon="@drawable/ic_send"
-        android:title="@string/send"
-        app:showAsAction="always" />
-
-</menu>
\ No newline at end of file

From 9c9d0a5d21a4969113145c13230f9554e8cc1287 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 18:22:26 +0200
Subject: [PATCH 30/49] Add dep on ui_style to attachment viewer

---
 attachment-viewer/build.gradle                         |  2 ++
 .../src/main/res/layout/item_image_attachment.xml      | 10 +++-------
 attachment-viewer/src/main/res/values/colors.xml       |  6 ------
 library/ui-styles/src/main/res/values/colors.xml       |  2 ++
 4 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 attachment-viewer/src/main/res/values/colors.xml

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index c9814171d9..4b95b20029 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -47,6 +47,8 @@ android {
 }
 
 dependencies {
+    implementation project(":library:ui-styles")
+
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
diff --git a/attachment-viewer/src/main/res/layout/item_image_attachment.xml b/attachment-viewer/src/main/res/layout/item_image_attachment.xml
index 91a009df2a..0f9a90e91c 100644
--- a/attachment-viewer/src/main/res/layout/item_image_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_image_attachment.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <com.github.chrisbanes.photoview.PhotoView
         android:id="@+id/touchImageView"
-        android:visibility="visible"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
     <ProgressBar
-        android:layout_centerInParent="true"
         android:id="@+id/imageLoaderProgress"
         style="?android:attr/progressBarStyle"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:visibility="visible"
-        tools:visibility="gone" />
+        android:layout_centerInParent="true" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/attachment-viewer/src/main/res/values/colors.xml b/attachment-viewer/src/main/res/values/colors.xml
deleted file mode 100644
index 7ceef40881..0000000000
--- a/attachment-viewer/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-
-    <color name="half_transparent_status_bar">#80000000</color>
-
-</resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index c63c8c0875..1e94d65c55 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -29,6 +29,8 @@
     <!-- Emoji text has to use a black text color -->
     <color name="emoji_color">@android:color/black</color>
 
+    <color name="half_transparent_status_bar">#80000000</color>
+
     <color name="black_alpha">#55000000</color>
     <color name="black_54">#8A000000</color>
 

From b3a547cd8715b0e0964d3e0bd06901162c4794b1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 18:35:11 +0200
Subject: [PATCH 31/49] Move and rename some files

---
 .../main/res/drawable-hdpi/element_splash_white.png | Bin
 .../main/res/drawable-mdpi/element_splash_white.png | Bin
 .../res/drawable-xhdpi/element_splash_white.png     | Bin
 .../res/drawable-xxhdpi/element_splash_white.png    | Bin
 .../res/drawable-xxxhdpi/element_splash_white.png   | Bin
 .../ui-styles}/src/main/res/drawable/splash.xml     |   2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename vector/src/main/res/drawable-hdpi/riot_splash_white.png => library/ui-styles/src/main/res/drawable-hdpi/element_splash_white.png (100%)
 rename vector/src/main/res/drawable-mdpi/riot_splash_white.png => library/ui-styles/src/main/res/drawable-mdpi/element_splash_white.png (100%)
 rename vector/src/main/res/drawable-xhdpi/riot_splash_white.png => library/ui-styles/src/main/res/drawable-xhdpi/element_splash_white.png (100%)
 rename vector/src/main/res/drawable-xxhdpi/riot_splash_white.png => library/ui-styles/src/main/res/drawable-xxhdpi/element_splash_white.png (100%)
 rename vector/src/main/res/drawable-xxxhdpi/riot_splash_white.png => library/ui-styles/src/main/res/drawable-xxxhdpi/element_splash_white.png (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/splash.xml (85%)

diff --git a/vector/src/main/res/drawable-hdpi/riot_splash_white.png b/library/ui-styles/src/main/res/drawable-hdpi/element_splash_white.png
similarity index 100%
rename from vector/src/main/res/drawable-hdpi/riot_splash_white.png
rename to library/ui-styles/src/main/res/drawable-hdpi/element_splash_white.png
diff --git a/vector/src/main/res/drawable-mdpi/riot_splash_white.png b/library/ui-styles/src/main/res/drawable-mdpi/element_splash_white.png
similarity index 100%
rename from vector/src/main/res/drawable-mdpi/riot_splash_white.png
rename to library/ui-styles/src/main/res/drawable-mdpi/element_splash_white.png
diff --git a/vector/src/main/res/drawable-xhdpi/riot_splash_white.png b/library/ui-styles/src/main/res/drawable-xhdpi/element_splash_white.png
similarity index 100%
rename from vector/src/main/res/drawable-xhdpi/riot_splash_white.png
rename to library/ui-styles/src/main/res/drawable-xhdpi/element_splash_white.png
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_splash_white.png b/library/ui-styles/src/main/res/drawable-xxhdpi/element_splash_white.png
similarity index 100%
rename from vector/src/main/res/drawable-xxhdpi/riot_splash_white.png
rename to library/ui-styles/src/main/res/drawable-xxhdpi/element_splash_white.png
diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_splash_white.png b/library/ui-styles/src/main/res/drawable-xxxhdpi/element_splash_white.png
similarity index 100%
rename from vector/src/main/res/drawable-xxxhdpi/riot_splash_white.png
rename to library/ui-styles/src/main/res/drawable-xxxhdpi/element_splash_white.png
diff --git a/vector/src/main/res/drawable/splash.xml b/library/ui-styles/src/main/res/drawable/splash.xml
similarity index 85%
rename from vector/src/main/res/drawable/splash.xml
rename to library/ui-styles/src/main/res/drawable/splash.xml
index d711ca3440..067688fd79 100644
--- a/vector/src/main/res/drawable/splash.xml
+++ b/library/ui-styles/src/main/res/drawable/splash.xml
@@ -10,7 +10,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/riot_splash_white" />
+            android:src="@drawable/element_splash_white" />
     </item>
 
 </layer-list>
\ No newline at end of file

From 06cbbbe1e87d031e295e50d5a89fe5e0a0c48870 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 18:40:58 +0200
Subject: [PATCH 32/49] Fix errors

---
 .../src/debug/res/layout/activity_debug_button_styles.xml       | 2 +-
 .../src/debug/res/layout/activity_test_material_theme.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
index b0baab6e38..1d10d3fb49 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".features.debug.DebugVectorButtonStylesActivity"
+    tools:context=".debug.DebugVectorButtonStylesActivity"
     tools:ignore="HardcodedText">
 
     <LinearLayout
diff --git a/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml b/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
index 20ad972096..95f440bd02 100644
--- a/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".features.debug.DebugMaterialThemeActivity"
+    tools:context=".debug.DebugMaterialThemeActivity"
     tools:ignore="HardcodedText,MissingPrefix">
 
     <androidx.constraintlayout.widget.ConstraintLayout

From a67f8ca4dc4d6d0c22d2ad17a68be9f7b3e396d3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 19:00:07 +0200
Subject: [PATCH 33/49] Add some missing style. Default is not workong (?)

---
 .../src/main/res/layout/item_video_attachment.xml    |  3 ++-
 library/ui-styles/src/debug/AndroidManifest.xml      |  2 +-
 .../ElementFeature/root/res/layout/fragment.xml.ftl  |  1 +
 vector/src/main/res/layout/activity_bug_report.xml   |  3 +++
 .../src/main/res/layout/activity_call_transfer.xml   |  1 +
 .../res/layout/bottom_sheet_invited_to_space.xml     |  2 ++
 .../res/layout/bottom_sheet_logout_and_backup.xml    |  2 ++
 .../composer_layout_constraint_set_expanded.xml      |  2 ++
 .../main/res/layout/dialog_background_sync_mode.xml  |  6 ++++++
 .../res/layout/dialog_confirmation_with_reason.xml   |  1 +
 vector/src/main/res/layout/dialog_device_verify.xml  |  8 ++++++++
 .../src/main/res/layout/dialog_no_sticker_pack.xml   |  1 +
 .../src/main/res/layout/dialog_prompt_password.xml   |  1 +
 .../src/main/res/layout/dialog_ssl_fingerprint.xml   |  6 ++++++
 .../res/layout/fragment_bootstrap_migrate_backup.xml |  2 ++
 .../main/res/layout/fragment_deactivate_account.xml  |  1 +
 .../layout/fragment_keys_backup_restore_from_key.xml |  1 +
 .../fragment_keys_backup_restore_from_passphrase.xml |  1 +
 .../res/layout/fragment_keys_backup_setup_step1.xml  |  2 ++
 .../res/layout/fragment_keys_backup_setup_step2.xml  |  1 +
 vector/src/main/res/layout/fragment_login_splash.xml |  1 +
 .../src/main/res/layout/fragment_login_splash_2.xml  |  1 +
 .../layout/fragment_matrix_to_room_space_card.xml    |  3 +++
 vector/src/main/res/layout/fragment_room_detail.xml  |  1 +
 vector/src/main/res/layout/fragment_room_widget.xml  |  1 +
 .../fragment_settings_notifications_troubleshoot.xml |  2 ++
 .../src/main/res/layout/fragment_ssss_reset_all.xml  |  1 +
 vector/src/main/res/layout/grid_section_header.xml   |  1 +
 .../res/layout/item_bottom_sheet_message_status.xml  |  1 +
 vector/src/main/res/layout/item_device.xml           |  3 +++
 vector/src/main/res/layout/item_emoji_result.xml     |  1 +
 vector/src/main/res/layout/item_emoji_verif.xml      |  1 +
 vector/src/main/res/layout/item_error_retry.xml      |  1 +
 vector/src/main/res/layout/item_generic_footer.xml   |  1 +
 vector/src/main/res/layout/item_generic_list.xml     |  2 ++
 .../src/main/res/layout/item_generic_pill_footer.xml |  1 +
 vector/src/main/res/layout/item_locale.xml           |  1 +
 .../src/main/res/layout/item_login_error_retry.xml   |  1 +
 vector/src/main/res/layout/item_no_result.xml        |  1 +
 .../res/layout/item_notification_troubleshoot.xml    |  1 +
 vector/src/main/res/layout/item_pushgateway.xml      | 12 ++++++++++++
 vector/src/main/res/layout/item_pushrule_raw.xml     |  2 ++
 vector/src/main/res/layout/item_search_result.xml    |  1 +
 vector/src/main/res/layout/item_space_roomchild.xml  |  1 +
 .../src/main/res/layout/item_space_top_summary.xml   |  1 +
 .../layout/item_timeline_event_code_block_stub.xml   |  1 +
 .../main/res/layout/item_timeline_event_create.xml   |  1 +
 .../res/layout/item_timeline_event_file_stub.xml     |  1 +
 ...item_timeline_event_merged_room_creation_stub.xml |  1 +
 vector/src/main/res/layout/item_tos.xml              |  2 ++
 .../src/main/res/layout/item_verification_wait.xml   |  3 +++
 .../main/res/layout/merge_overlay_waiting_view.xml   |  1 +
 .../main/res/layout/vector_preference_push_rule.xml  |  2 ++
 .../main/res/layout/view_active_conference_view.xml  |  1 +
 .../src/main/res/layout/view_jump_to_read_marker.xml |  1 +
 .../src/main/res/layout/view_notification_area.xml   |  1 +
 .../src/main/res/layout/view_room_widgets_banner.xml |  1 +
 vector/src/main/res/layout/view_sync_state.xml       |  2 ++
 58 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
index c693ee37c5..6ff0d68078 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -36,11 +36,12 @@
 
     <TextView
         android:id="@+id/videoMediaViewerErrorView"
+        style="@style/VectorTextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_margin="16dp"
-        android:textSize="16sp"
+        android:textColor="?colorError"
         android:visibility="gone"
         tools:text="Error"
         tools:visibility="visible" />
diff --git a/library/ui-styles/src/debug/AndroidManifest.xml b/library/ui-styles/src/debug/AndroidManifest.xml
index b0c32f3975..91b5daf1ce 100644
--- a/library/ui-styles/src/debug/AndroidManifest.xml
+++ b/library/ui-styles/src/debug/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="im.vector.lib.ui.styles">
 
-    <application>
+    <application android:theme="@style/AppTheme.Light">
         <activity
             android:name=".debug.DebugMaterialThemeLightDefaultActivity"
             android:theme="@style/VectorMaterialThemeDebugLight" />
diff --git a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
index 539c40f3f9..168faae1a3 100644
--- a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
+++ b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
@@ -9,6 +9,7 @@
 
     <TextView
         android:id="@+id/message"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="${fragmentClass}"
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 840a3439d9..c59627454a 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -26,6 +26,7 @@
 
         <TextView
             android:id="@+id/bug_report_progress_text_view"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -63,6 +64,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_first_text"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -101,6 +103,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_logs_description"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml
index bb540d780a..ee3833b241 100644
--- a/vector/src/main/res/layout/activity_call_transfer.xml
+++ b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -60,6 +60,7 @@
 
             <TextView
                 android:id="@+id/callTransferConsultTitle"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index f523303aba..dc4bb457cd 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -36,6 +36,7 @@
 
             <TextView
                 android:id="@+id/inviterText"
+                style="@style/VectorTextView.Subtitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -48,6 +49,7 @@
 
             <TextView
                 android:id="@+id/inviterMxid"
+                style="@style/VectorTextView.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index b9d1deb318..589e237789 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -23,6 +23,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_signout_warning_text"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -62,6 +63,7 @@
 
         <TextView
             android:id="@+id/backupStatusText"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 4c5034ed96..e40351b21d 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -42,6 +42,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
@@ -67,6 +68,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageContent"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/dialog_background_sync_mode.xml b/vector/src/main/res/layout/dialog_background_sync_mode.xml
index 96428ef06f..a644de6df1 100644
--- a/vector/src/main/res/layout/dialog_background_sync_mode.xml
+++ b/vector/src/main/res/layout/dialog_background_sync_mode.xml
@@ -17,6 +17,7 @@
             android:padding="16dp">
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_battery"
@@ -24,6 +25,7 @@
                 android:textStyle="bold" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -41,6 +43,7 @@
             android:padding="16dp">
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_real_time"
@@ -48,6 +51,7 @@
                 android:textStyle="bold" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -65,6 +69,7 @@
             android:padding="16dp">
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_disabled"
@@ -72,6 +77,7 @@
                 android:textStyle="bold" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
index 677ffe4d7a..37fb66d269 100644
--- a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
+++ b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
@@ -12,6 +12,7 @@
 
     <TextView
         android:id="@+id/dialogConfirmationText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index 99612212e0..5472149f63 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -13,12 +13,14 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/encryption_information_verify_device_warning" />
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -27,11 +29,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_name"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device name" />
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -40,11 +44,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_id"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device id" />
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -53,11 +59,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_key"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device key" />
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
diff --git a/vector/src/main/res/layout/dialog_no_sticker_pack.xml b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
index 1cf225a30f..7559382f34 100644
--- a/vector/src/main/res/layout/dialog_no_sticker_pack.xml
+++ b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/VectorTextView.Body"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:drawablePadding="16dp"
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index 6938b318dd..49fd1d15fd 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -14,6 +14,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
diff --git a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
index 0c6fad871e..80acd89474 100644
--- a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
+++ b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
@@ -13,6 +13,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -20,6 +21,7 @@
 
         <TextView
             android:id="@+id/ssl_explanation"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -27,6 +29,7 @@
 
         <TextView
             android:id="@+id/ssl_user_id"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -34,6 +37,7 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint_title"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -41,12 +45,14 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="12dp"
             tools:text="07 89 7A A0 30 82 99 95 E6 17 5D 1F 34 5D 8D 0C 67 82 63 1C 1F 57 20 75 42 91 F7 8B 28 03 54 A2" />
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index c446347ae8..d9ec278c7a 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -46,10 +46,12 @@
             android:layout_height="wrap_content"
             android:text="@string/use_file"
             app:icon="@drawable/ic_file"
+            tools:ignore="MissingPrefix"
             tools:visibility="visible" />
 
         <TextView
             android:id="@+id/bootstrapMigrateForgotPassphrase"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index dcade54896..bd343d8983 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -11,6 +11,7 @@
 
         <TextView
             android:id="@+id/deactivateAccountContent"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/deactivate_account_content"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index d834c81945..f108344c5c 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -77,6 +77,7 @@
 
         <TextView
             android:id="@+id/keys_restore_key_help_with_link"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index 26b3607568..3c7dd9f38e 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -74,6 +74,7 @@
 
         <TextView
             android:id="@+id/helperTextWithLink"
+            style="@style/VectorTextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index b10fca99f4..36b0158156 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -39,6 +39,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_description"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -65,6 +66,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_advanced_option_text"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index d9fabc694f..007eb596f2 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -120,6 +120,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_recovery_key_alternative"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 23102b76ee..545bb5522f 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -199,6 +199,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
index 17cf595e0d..190044fcdf 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -216,6 +216,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
+        style="@style/VectorTextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 05141795c3..fa6c4c208c 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -81,11 +81,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/matrixToAccessText"
             app:tint="?vctr_content_secondary"
+            tools:ignore="MissingPrefix"
             tools:src="@drawable/ic_public_room"
             tools:visibility="visible" />
 
         <TextView
             android:id="@+id/matrixToAccessText"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -131,6 +133,7 @@
 
             <TextView
                 android:id="@+id/spaceChildMemberCountText"
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index e4b4e69c05..4af84c63ee 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -63,6 +63,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarSubtitleView"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_widget.xml b/vector/src/main/res/layout/fragment_room_widget.xml
index 604e7fc947..196ebfaff4 100644
--- a/vector/src/main/res/layout/fragment_room_widget.xml
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -40,6 +40,7 @@
 
         <TextView
             android:id="@+id/widgetErrorText"
+            style="@style/VectorTextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
index 9ddf1b133e..cf09b14361 100644
--- a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
+++ b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
@@ -30,6 +30,7 @@
 
         <TextView
             android:id="@+id/troubleshoot_summ_title"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -41,6 +42,7 @@
 
         <TextView
             android:id="@+id/toubleshoot_summ_description"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index 0718a98982..b4ca7f05a9 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -30,6 +30,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_all_description"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index 65aa68dab6..892d86d670 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -6,6 +6,7 @@
 
     <TextView
         android:id="@+id/section_header_textview"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index 7668bbec78..4650eeee47 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -21,6 +21,7 @@
 
     <TextView
         android:id="@+id/messageStatusText"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 78c7b2dcff..39c1f04aa7 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -40,6 +40,7 @@
 
         <TextView
             android:id="@+id/itemDeviceDisplayName"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -56,6 +57,7 @@
 
         <TextView
             android:id="@+id/itemDeviceId"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
@@ -74,6 +76,7 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeen"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index 6490cb9ed9..82b43776a2 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -38,6 +38,7 @@
 
         <TextView
             android:id="@+id/item_emoji_keyword"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="2"
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index 0e71831e84..ef46639041 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -35,6 +35,7 @@
 
     <TextView
         android:id="@+id/item_emoji_name_tv"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_error_retry.xml b/vector/src/main/res/layout/item_error_retry.xml
index f8527b2870..ec03a13530 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -9,6 +9,7 @@
 
     <TextView
         android:id="@+id/itemErrorRetryText"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?colorError"
diff --git a/vector/src/main/res/layout/item_generic_footer.xml b/vector/src/main/res/layout/item_generic_footer.xml
index c5c4e7fcd5..3f4d09a26c 100644
--- a/vector/src/main/res/layout/item_generic_footer.xml
+++ b/vector/src/main/res/layout/item_generic_footer.xml
@@ -8,6 +8,7 @@
 
     <TextView
         android:id="@+id/itemGenericFooterText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 9cc240e557..b436b2d64c 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -24,6 +24,7 @@
 
     <TextView
         android:id="@+id/item_generic_title_text"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -46,6 +47,7 @@
 
     <TextView
         android:id="@+id/item_generic_description_text"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_generic_pill_footer.xml b/vector/src/main/res/layout/item_generic_pill_footer.xml
index 2fbda9355a..06d09eed23 100644
--- a/vector/src/main/res/layout/item_generic_pill_footer.xml
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -20,6 +20,7 @@
 
     <TextView
         android:id="@+id/itemGenericPillText"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index ba78d12158..dabca844fc 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -24,6 +24,7 @@
 
     <TextView
         android:id="@+id/localeSubtitle"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_login_error_retry.xml b/vector/src/main/res/layout/item_login_error_retry.xml
index b6f8f1fe42..88ad676e3c 100644
--- a/vector/src/main/res/layout/item_login_error_retry.xml
+++ b/vector/src/main/res/layout/item_login_error_retry.xml
@@ -11,6 +11,7 @@
 
     <TextView
         android:id="@+id/itemLoginErrorRetryText"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_no_result.xml b/vector/src/main/res/layout/item_no_result.xml
index 5fc43a447a..5259719e55 100644
--- a/vector/src/main/res/layout/item_no_result.xml
+++ b/vector/src/main/res/layout/item_no_result.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/itemNoResultText"
+    style="@style/VectorTextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index 52807dee0b..a69eaff0f9 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -41,6 +41,7 @@
 
     <TextView
         android:id="@+id/troubleshootTestDescription"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index ef86681e43..a69107c86c 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -18,6 +18,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppId"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -27,6 +28,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppIdValue"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -35,6 +37,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKey"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -44,6 +47,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKeyValue"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -52,6 +56,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppName"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -61,6 +66,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppNameValue"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -69,6 +75,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceName"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -78,6 +85,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceNameValue"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -87,6 +95,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURL"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -95,6 +104,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURLValue"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -103,6 +113,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormat"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -112,6 +123,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormatValue"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index bc1734e4fd..55ba8756e1 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -16,6 +16,7 @@
 
         <TextView
             android:id="@+id/pushRuleId"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
@@ -25,6 +26,7 @@
 
         <TextView
             android:id="@+id/pushRuleDescription"
+            style="@style/VectorTextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 98fd4a5036..2e941ca6cb 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -50,6 +50,7 @@
 
     <TextView
         android:id="@+id/messageContentView"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index 44927969ca..bed015c4ca 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -87,6 +87,7 @@
 
         <TextView
             android:id="@+id/spaceChildMemberCountText"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 08b053889d..33f344f7cf 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -21,6 +21,7 @@
 
     <TextView
         android:id="@+id/spaceSummaryMemberCountText"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
index fe9e29420e..4c09b7b9ca 100644
--- a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
@@ -19,6 +19,7 @@
 
     <TextView
         android:id="@+id/codeBlockEditedView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp" />
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index 2b469ed13f..74cccd746e 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -7,6 +7,7 @@
 
     <TextView
         android:id="@+id/roomCreateItemDescription"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index 3c551bea88..caa5b7e202 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -41,6 +41,7 @@
     <!-- the media -->
     <TextView
         android:id="@+id/messageFilenameView"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 0daf1672c3..6d5046f857 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -126,6 +126,7 @@
                 android:src="@drawable/ic_add_people" />
 
             <TextView
+                style="@style/VectorTextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index 2faab4921f..024cded8ae 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -16,6 +16,7 @@
 
     <TextView
         android:id="@+id/term_name"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
@@ -29,6 +30,7 @@
 
     <TextView
         android:id="@+id/term_description"
+        style="@style/VectorTextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index ecd7abae78..d7b41967a2 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -12,6 +12,7 @@
 
     <TextView
         android:id="@+id/use_latest_riot"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="start"
@@ -53,6 +54,7 @@
 
     <TextView
         android:id="@+id/app_desktop_web"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -65,6 +67,7 @@
 
     <TextView
         android:id="@+id/app_ios_android"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index e634cf8c83..ffb98e5374 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -43,6 +43,7 @@
 
                 <TextView
                     android:id="@+id/waitingStatusText"
+                    style="@style/VectorTextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index 1028b3210c..3328b40885 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -19,6 +19,7 @@
 
         <TextView
             android:id="@android:id/title"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
@@ -29,6 +30,7 @@
 
         <TextView
             android:id="@android:id/summary"
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index 97f0dd5cd4..4cec603b87 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -9,6 +9,7 @@
 
     <TextView
         android:id="@+id/activeConferenceInfo"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/deleteWidgetButton"
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 5f5944fa17..9cf29dcbfb 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -9,6 +9,7 @@
 
     <TextView
         android:id="@+id/jumpToReadMarkerLabelView"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@+id/closeJumpToReadMarkerView"
diff --git a/vector/src/main/res/layout/view_notification_area.xml b/vector/src/main/res/layout/view_notification_area.xml
index e8a4600544..7a82dd3381 100644
--- a/vector/src/main/res/layout/view_notification_area.xml
+++ b/vector/src/main/res/layout/view_notification_area.xml
@@ -24,6 +24,7 @@
 
     <TextView
         android:id="@+id/roomNotificationMessage"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
diff --git a/vector/src/main/res/layout/view_room_widgets_banner.xml b/vector/src/main/res/layout/view_room_widgets_banner.xml
index 4cb1010201..dbc59dcc9b 100644
--- a/vector/src/main/res/layout/view_room_widgets_banner.xml
+++ b/vector/src/main/res/layout/view_room_widgets_banner.xml
@@ -23,6 +23,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsViewAction"
+        style="@style/VectorTextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/view_sync_state.xml b/vector/src/main/res/layout/view_sync_state.xml
index 86e3133ace..8ae4f4235b 100644
--- a/vector/src/main/res/layout/view_sync_state.xml
+++ b/vector/src/main/res/layout/view_sync_state.xml
@@ -26,6 +26,7 @@
 
     <TextView
         android:id="@+id/syncStateNoNetwork"
+        style="@style/VectorTextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorError"
@@ -46,6 +47,7 @@
         tools:visibility="visible">
 
         <TextView
+            style="@style/VectorTextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

From 0590acd31a9a7a3d0c331805421a6f83ca188432 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 19:19:17 +0200
Subject: [PATCH 34/49] Fix crash on default theme

---
 .../ui-styles/src/debug/AndroidManifest.xml   | 13 +++++++-
 .../debug/DebugVectorButtonStylesActivity.kt  |  2 +-
 .../DebugVectorButtonStylesDarkActivity.kt    | 19 ++++++++++++
 .../DebugVectorButtonStylesLightActivity.kt   | 19 ++++++++++++
 .../debug/DebugVectorTextViewActivity.kt      | 31 +++++++++++++++++++
 .../debug/DebugVectorTextViewDarkActivity.kt  | 19 ++++++++++++
 .../debug/DebugVectorTextViewLightActivity.kt | 19 ++++++++++++
 ..._view.xml => activity_debug_text_view.xml} |  0
 .../layout/activity_test_material_theme.xml   | 10 ------
 .../app/features/debug/DebugMenuActivity.kt   | 18 +++++++++--
 .../debug/res/layout/activity_debug_menu.xml  | 26 ++++++++++++++--
 11 files changed, 159 insertions(+), 17 deletions(-)
 create mode 100644 library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.kt
 create mode 100644 library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesLightActivity.kt
 create mode 100644 library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewActivity.kt
 create mode 100644 library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewDarkActivity.kt
 create mode 100644 library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewLightActivity.kt
 rename library/ui-styles/src/debug/res/layout/{debug_text_view.xml => activity_debug_text_view.xml} (100%)

diff --git a/library/ui-styles/src/debug/AndroidManifest.xml b/library/ui-styles/src/debug/AndroidManifest.xml
index 91b5daf1ce..57020a0518 100644
--- a/library/ui-styles/src/debug/AndroidManifest.xml
+++ b/library/ui-styles/src/debug/AndroidManifest.xml
@@ -21,9 +21,20 @@
         <activity
             android:name=".debug.DebugMaterialThemeDarkVectorActivity"
             android:theme="@style/AppTheme.Dark" />
+
         <activity
-            android:name=".debug.DebugVectorButtonStylesActivity"
+            android:name=".debug.DebugVectorButtonStylesLightActivity"
             android:theme="@style/AppTheme.Light" />
+        <activity
+            android:name=".debug.DebugVectorButtonStylesDarkActivity"
+            android:theme="@style/AppTheme.Dark" />
+
+        <activity
+            android:name=".debug.DebugVectorTextViewLightActivity"
+            android:theme="@style/AppTheme.Light" />
+        <activity
+            android:name=".debug.DebugVectorTextViewDarkActivity"
+            android:theme="@style/AppTheme.Dark" />
     </application>
 
 </manifest>
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
index 55c86d6c80..50d1e344e9 100644
--- a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
@@ -20,7 +20,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import im.vector.lib.ui.styles.databinding.ActivityDebugButtonStylesBinding
 
-class DebugVectorButtonStylesActivity : AppCompatActivity() {
+abstract class DebugVectorButtonStylesActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.kt
new file mode 100644
index 0000000000..102ca53f3c
--- /dev/null
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesDarkActivity.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+class DebugVectorButtonStylesDarkActivity : DebugVectorButtonStylesActivity()
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesLightActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesLightActivity.kt
new file mode 100644
index 0000000000..c1b01dc6a3
--- /dev/null
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesLightActivity.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+class DebugVectorButtonStylesLightActivity : DebugVectorButtonStylesActivity()
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewActivity.kt
new file mode 100644
index 0000000000..ac3d4ea696
--- /dev/null
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewActivity.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import im.vector.lib.ui.styles.databinding.ActivityDebugTextViewBinding
+
+// Rendering is not the same with VectorBaseActivity
+abstract class DebugVectorTextViewActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val views = ActivityDebugTextViewBinding.inflate(layoutInflater)
+        setContentView(views.root)
+    }
+}
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewDarkActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewDarkActivity.kt
new file mode 100644
index 0000000000..2d95056fef
--- /dev/null
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewDarkActivity.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+class DebugVectorTextViewDarkActivity : DebugVectorTextViewActivity()
diff --git a/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewLightActivity.kt b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewLightActivity.kt
new file mode 100644
index 0000000000..33e4a0f075
--- /dev/null
+++ b/library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorTextViewLightActivity.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.ui.styles.debug
+
+class DebugVectorTextViewLightActivity : DebugVectorTextViewActivity()
diff --git a/library/ui-styles/src/debug/res/layout/debug_text_view.xml b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
similarity index 100%
rename from library/ui-styles/src/debug/res/layout/debug_text_view.xml
rename to library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
diff --git a/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml b/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
index 95f440bd02..dca2f33abe 100644
--- a/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
@@ -441,16 +441,6 @@
 
                 </com.google.android.material.card.MaterialCardView>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Text views" />
-
-                <include
-                    layout="@layout/debug_text_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 90dccc0437..539091c7ce 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -43,7 +43,10 @@ import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkVectorActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightDefaultActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightTestActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightVectorActivity
-import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesActivity
+import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesDarkActivity
+import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesLightActivity
+import im.vector.lib.ui.styles.debug.DebugVectorTextViewDarkActivity
+import im.vector.lib.ui.styles.debug.DebugVectorTextViewLightActivity
 import org.matrix.android.sdk.internal.crypto.verification.qrcode.toQrCodeData
 
 import timber.log.Timber
@@ -78,8 +81,17 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
 
     private fun setupViews() {
         views.debugTestTextViewLink.setOnClickListener { testTextViewLink() }
-        views.debugOpenButtonStyles.setOnClickListener {
-            startActivity(Intent(this, DebugVectorButtonStylesActivity::class.java))
+        views.debugOpenButtonStylesLight.setOnClickListener {
+            startActivity(Intent(this, DebugVectorButtonStylesLightActivity::class.java))
+        }
+        views.debugOpenButtonStylesDark.setOnClickListener {
+            startActivity(Intent(this, DebugVectorButtonStylesDarkActivity::class.java))
+        }
+        views.debugTestTextViewLight.setOnClickListener {
+            startActivity(Intent(this, DebugVectorTextViewLightActivity::class.java))
+        }
+        views.debugTestTextViewDark.setOnClickListener {
+            startActivity(Intent(this, DebugVectorTextViewDarkActivity::class.java))
         }
         views.debugShowSasEmoji.setOnClickListener { showSasEmoji() }
         views.debugTestNotification.setOnClickListener { testNotification() }
diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml
index 454d8992fd..60cfc1e826 100644
--- a/vector/src/debug/res/layout/activity_debug_menu.xml
+++ b/vector/src/debug/res/layout/activity_debug_menu.xml
@@ -66,6 +66,20 @@
                     android:text="Vector" />
             </LinearLayout>
 
+            <Button
+                android:id="@+id/debug_open_button_styles_light"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="See button light" />
+
+            <Button
+                android:id="@+id/debug_test_text_view_light"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_margin="8dp"
+                android:layout_weight="1"
+                android:text="Text Views Light" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -101,10 +115,18 @@
             </LinearLayout>
 
             <Button
-                android:id="@+id/debug_open_button_styles"
+                android:id="@+id/debug_test_text_view_dark"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_margin="8dp"
+                android:layout_weight="1"
+                android:text="Text Views Dark" />
+
+            <Button
+                android:id="@+id/debug_open_button_styles_dark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="See button styles" />
+                android:text="See button dark" />
 
             <Button
                 android:id="@+id/debug_show_sas_emoji"

From 858bbfd8d2b76bd8ceecbfbb299485664b9ca8fc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 21:37:27 +0200
Subject: [PATCH 35/49] Rename style to follow naming conventions And move some
 files to the module

---
 .../main/res/layout/item_video_attachment.xml |  2 +-
 library/ui-styles/build.gradle                |  2 +
 .../layout/activity_debug_button_styles.xml   | 36 ++++++-------
 .../res/layout/activity_debug_text_view.xml   | 38 +++++++-------
 .../bottom_navigation_icon_tint_selector.xml  |  0
 .../color/button_background_tint_selector.xml |  0
 ...social_google_background_selector_dark.xml |  0
 ...ocial_google_background_selector_light.xml |  0
 .../main/res/color/color_primary_alpha25.xml  |  0
 .../res/drawable/bg_bottom_navigation.xml     |  0
 .../src/main/res/drawable/bg_pin_key.xml      |  0
 .../main/res/drawable/element_logo_green.xml  |  0
 .../main/res/drawable/file_progress_bar.xml   |  0
 .../src/main/res/drawable/ic_search.xml       |  0
 .../src/main/res/drawable/ic_social_apple.xml |  0
 .../main/res/drawable/ic_social_facebook.xml  |  0
 .../main/res/drawable/ic_social_github.xml    |  0
 .../main/res/drawable/ic_social_gitlab.xml    |  0
 .../main/res/drawable/ic_social_google.xml    |  0
 .../main/res/drawable/ic_social_twitter.xml   |  0
 .../src/main/res/drawable/ic_x_gray.xml       |  0
 .../main/res/drawable/pin_code_dot_empty.xml  |  0
 .../main/res/drawable/pin_code_dot_fill.xml   |  0
 .../src/main/res/drawable/pin_code_dots.xml   |  0
 .../res/drawable/vector_label_background.xml  |  0
 .../src/main/res/values/style_snackbar.xml    |  6 +--
 .../ui-styles/src/main/res/values/styles.xml  |  2 -
 .../main/res/values/styles_alert_dialog.xml   |  4 +-
 .../res/values/styles_bottom_navigation.xml   |  2 +-
 .../main/res/values/styles_bottom_sheet.xml   |  6 +--
 .../src/main/res/values/styles_buttons.xml    | 28 +++++-----
 .../src/main/res/values/styles_edit_text.xml  | 10 +---
 .../src/main/res/values/styles_login.xml      |  6 +--
 .../src/main/res/values/styles_pin_code.xml   |  2 +-
 .../src/main/res/values/styles_popup.xml      |  5 +-
 .../src/main/res/values/styles_progress.xml   |  4 +-
 .../main/res/values/styles_search_view.xml    |  2 +-
 .../main/res/values/styles_social_login.xml   | 38 +++++++-------
 .../src/main/res/values/styles_text_view.xml  | 38 +++++++-------
 .../src/main/res/values/styles_toolbar.xml    | 22 ++++----
 .../src/main/res/values/text_appearances.xml  | 20 +++----
 .../src/main/res/values/theme_black.xml       |  2 +-
 .../src/main/res/values/theme_dark.xml        | 52 +++++++++----------
 .../src/main/res/values/theme_light.xml       | 52 +++++++++----------
 tools/check/forbidden_strings_in_layout.txt   |  2 +-
 .../root/res/layout/fragment.xml.ftl          |  2 +-
 .../src/debug/res/layout/item_sas_emoji.xml   |  8 +--
 .../app/features/popup/PopupAlertManager.kt   |  2 +-
 .../main/res/layout/activity_bug_report.xml   |  8 +--
 vector/src/main/res/layout/activity_call.xml  |  6 +--
 .../res/layout/activity_call_transfer.xml     |  4 +-
 .../main/res/layout/activity_signed_out.xml   |  6 +--
 .../res/layout/activity_vector_settings.xml   |  4 +-
 .../layout/alerter_incoming_call_layout.xml   |  4 +-
 .../layout/alerter_verification_layout.xml    |  4 +-
 .../res/layout/bottom_sheet_bootstrap.xml     |  2 +-
 .../res/layout/bottom_sheet_call_dial_pad.xml |  2 +-
 .../bottom_sheet_generic_list_with_title.xml  |  2 +-
 .../layout/bottom_sheet_invited_to_space.xml  |  4 +-
 .../layout/bottom_sheet_logout_and_backup.xml |  6 +--
 .../bottom_sheet_room_widget_permission.xml   | 14 ++---
 .../layout/bottom_sheet_save_recovery_key.xml |  8 +--
 .../res/layout/bottom_sheet_space_invite.xml  |  6 +--
 .../bottom_sheet_space_invite_chooser.xml     |  2 +-
 .../layout/bottom_sheet_space_settings.xml    |  4 +-
 .../res/layout/bottom_sheet_verification.xml  |  2 +-
 .../src/main/res/layout/composer_layout.xml   |  2 +-
 ...composer_layout_constraint_set_compact.xml |  2 +-
 ...omposer_layout_constraint_set_expanded.xml |  6 +--
 .../custom_action_item_layout_badge.xml       |  2 +-
 .../layout/dialog_background_sync_mode.xml    | 12 ++---
 .../dialog_confirmation_with_reason.xml       |  2 +-
 .../main/res/layout/dialog_device_verify.xml  | 16 +++---
 .../res/layout/dialog_disclaimer_content.xml  |  4 +-
 .../main/res/layout/dialog_event_content.xml  |  2 +-
 .../res/layout/dialog_export_e2e_keys.xml     |  2 +-
 .../res/layout/dialog_import_e2e_keys.xml     |  2 +-
 .../res/layout/dialog_no_sticker_pack.xml     |  2 +-
 .../res/layout/dialog_prompt_password.xml     |  2 +-
 .../layout/dialog_recovery_key_saved_info.xml |  4 +-
 .../res/layout/dialog_ssl_fingerprint.xml     | 12 ++---
 .../layout/fragment_bootstrap_conclusion.xml  |  2 +-
 ...gment_bootstrap_enter_account_password.xml |  4 +-
 .../fragment_bootstrap_enter_passphrase.xml   |  6 +--
 .../fragment_bootstrap_migrate_backup.xml     |  8 +--
 .../res/layout/fragment_bootstrap_reauth.xml  |  8 +--
 .../layout/fragment_bootstrap_save_key.xml    |  4 +-
 .../fragment_bootstrap_setup_recovery.xml     |  4 +-
 .../res/layout/fragment_bootstrap_waiting.xml |  4 +-
 .../res/layout/fragment_contacts_book.xml     |  4 +-
 ...ent_create_direct_room_directory_users.xml |  2 +-
 .../main/res/layout/fragment_create_room.xml  |  2 +-
 .../layout/fragment_deactivate_account.xml    |  4 +-
 .../main/res/layout/fragment_home_detail.xml  |  6 +--
 .../main/res/layout/fragment_home_drawer.xml  | 10 ++--
 .../fragment_keys_backup_restore_from_key.xml |  4 +-
 ...nt_keys_backup_restore_from_passphrase.xml |  4 +-
 .../fragment_keys_backup_restore_success.xml  |  4 +-
 .../fragment_keys_backup_setup_step1.xml      |  8 +--
 .../fragment_keys_backup_setup_step2.xml      |  8 +--
 .../fragment_keys_backup_setup_step3.xml      | 10 ++--
 vector/src/main/res/layout/fragment_login.xml | 12 ++---
 .../layout/fragment_login_account_created.xml | 20 +++----
 .../res/layout/fragment_login_captcha.xml     |  2 +-
 ...fragment_login_generic_text_input_form.xml | 10 ++--
 ...agment_login_generic_text_input_form_2.xml | 14 ++---
 .../layout/fragment_login_reset_password.xml  |  6 +--
 .../fragment_login_reset_password_2.xml       | 10 ++--
 ...login_reset_password_mail_confirmation.xml |  8 +--
 ...gin_reset_password_mail_confirmation_2.xml |  8 +--
 .../fragment_login_reset_password_success.xml |  8 +--
 ...ragment_login_reset_password_success_2.xml |  8 +--
 .../fragment_login_server_selection.xml       | 16 +++---
 .../fragment_login_server_selection_2.xml     | 14 ++---
 .../layout/fragment_login_server_url_form.xml | 12 ++---
 .../fragment_login_server_url_form_2.xml      |  6 +--
 .../fragment_login_signin_password_2.xml      | 10 ++--
 .../layout/fragment_login_signin_to_any_2.xml |  8 +--
 .../fragment_login_signin_username_2.xml      | 10 ++--
 .../fragment_login_signup_password_2.xml      | 12 ++---
 ...fragment_login_signup_signin_selection.xml | 10 ++--
 .../fragment_login_signup_username_2.xml      | 10 ++--
 .../main/res/layout/fragment_login_splash.xml | 12 ++---
 .../res/layout/fragment_login_splash_2.xml    | 14 ++---
 .../res/layout/fragment_login_sso_only_2.xml  |  4 +-
 .../main/res/layout/fragment_login_terms.xml  |  6 +--
 .../res/layout/fragment_login_terms_2.xml     |  6 +--
 .../layout/fragment_login_wait_for_email.xml  |  4 +-
 .../fragment_login_wait_for_email_2.xml       |  8 +--
 .../res/layout/fragment_matrix_profile.xml    |  2 +-
 .../fragment_matrix_to_room_space_card.xml    | 14 ++---
 .../layout/fragment_matrix_to_user_card.xml   |  4 +-
 .../main/res/layout/fragment_public_rooms.xml |  2 +-
 .../res/layout/fragment_reauth_confirm.xml    |  6 +--
 .../fragment_recyclerview_with_search.xml     |  4 +-
 .../main/res/layout/fragment_review_terms.xml |  2 +-
 .../main/res/layout/fragment_room_detail.xml  |  4 +-
 .../fragment_room_preview_no_preview.xml      | 12 ++---
 .../layout/fragment_room_setting_generic.xml  |  2 +-
 .../main/res/layout/fragment_room_uploads.xml |  2 +-
 .../main/res/layout/fragment_room_widget.xml  |  2 +-
 .../layout/fragment_set_identity_server.xml   |  8 +--
 ...nt_settings_notifications_troubleshoot.xml |  4 +-
 .../res/layout/fragment_space_add_rooms.xml   |  6 +--
 ...ment_space_create_choose_private_model.xml |  4 +-
 .../fragment_space_create_choose_type.xml     |  8 +--
 .../res/layout/fragment_space_preview.xml     |  8 +--
 .../layout/fragment_ssss_access_from_key.xml  |  8 +--
 .../fragment_ssss_access_from_passphrase.xml  | 10 ++--
 .../res/layout/fragment_ssss_reset_all.xml    | 14 ++---
 .../res/layout/fragment_user_code_show.xml    | 10 ++--
 .../res/layout/fragment_user_directory.xml    |  2 +-
 .../main/res/layout/fragment_user_list.xml    |  4 +-
 .../main/res/layout/grid_section_header.xml   |  2 +-
 .../res/layout/item_autocomplete_command.xml  |  6 +--
 .../res/layout/item_autocomplete_emoji.xml    |  6 +--
 .../layout/item_autocomplete_matrix_item.xml  |  4 +-
 .../layout/item_autocomplete_more_result.xml  |  2 +-
 .../res/layout/item_bottom_sheet_action.xml   |  2 +-
 .../item_bottom_sheet_message_preview.xml     |  8 +--
 .../item_bottom_sheet_message_status.xml      |  2 +-
 .../item_bottom_sheet_quick_reaction.xml      | 16 +++---
 .../res/layout/item_bottom_sheet_radio.xml    |  4 +-
 .../layout/item_bottom_sheet_room_preview.xml |  2 +-
 .../res/layout/item_bottom_sheet_title.xml    |  4 +-
 .../src/main/res/layout/item_breadcrumbs.xml  |  4 +-
 .../res/layout/item_completion_homeserver.xml |  2 +-
 .../main/res/layout/item_contact_action.xml   |  2 +-
 .../main/res/layout/item_contact_detail.xml   |  4 +-
 .../src/main/res/layout/item_contact_main.xml |  2 +-
 .../layout/item_create_direct_room_user.xml   |  4 +-
 vector/src/main/res/layout/item_device.xml    | 14 ++---
 .../src/main/res/layout/item_emoji_result.xml |  6 +--
 .../src/main/res/layout/item_emoji_verif.xml  |  4 +-
 .../src/main/res/layout/item_error_retry.xml  |  2 +-
 .../res/layout/item_expandable_textview.xml   |  2 +-
 .../res/layout/item_form_advanced_toggle.xml  |  2 +-
 .../src/main/res/layout/item_form_switch.xml  |  4 +-
 .../main/res/layout/item_generic_button.xml   |  2 +-
 .../res/layout/item_generic_empty_state.xml   |  4 +-
 .../main/res/layout/item_generic_footer.xml   |  2 +-
 .../main/res/layout/item_generic_header.xml   |  2 +-
 .../src/main/res/layout/item_generic_list.xml |  6 +--
 .../res/layout/item_generic_pill_footer.xml   |  2 +-
 .../res/layout/item_generic_with_value.xml    |  4 +-
 vector/src/main/res/layout/item_group.xml     |  2 +-
 .../src/main/res/layout/item_help_footer.xml  |  2 +-
 ...tem_keys_backup_settings_button_footer.xml |  2 +-
 .../src/main/res/layout/item_known_user.xml   |  4 +-
 vector/src/main/res/layout/item_loading.xml   |  2 +-
 vector/src/main/res/layout/item_locale.xml    |  4 +-
 .../res/layout/item_login_centered_button.xml |  2 +-
 .../res/layout/item_login_error_retry.xml     |  2 +-
 .../res/layout/item_login_password_form.xml   |  4 +-
 .../main/res/layout/item_login_red_button.xml |  2 +-
 .../src/main/res/layout/item_login_text.xml   |  2 +-
 .../src/main/res/layout/item_login_title.xml  |  2 +-
 .../res/layout/item_login_title_small.xml     |  2 +-
 vector/src/main/res/layout/item_no_result.xml |  2 +-
 .../layout/item_notification_troubleshoot.xml |  4 +-
 vector/src/main/res/layout/item_policy.xml    |  4 +-
 .../main/res/layout/item_positive_button.xml  |  2 +-
 .../main/res/layout/item_profile_action.xml   |  4 +-
 .../res/layout/item_profile_matrix_item.xml   |  6 +--
 .../item_profile_matrix_item_progress.xml     |  4 +-
 .../main/res/layout/item_profile_section.xml  |  2 +-
 .../src/main/res/layout/item_public_room.xml  |  8 +--
 .../src/main/res/layout/item_pushgateway.xml  | 26 +++++-----
 .../src/main/res/layout/item_pushrule_raw.xml |  4 +-
 vector/src/main/res/layout/item_room.xml      | 10 ++--
 .../res/layout/item_room_alias_text_input.xml |  4 +-
 .../main/res/layout/item_room_category.xml    |  4 +-
 .../main/res/layout/item_room_directory.xml   |  4 +-
 .../res/layout/item_room_directory_server.xml |  4 +-
 .../res/layout/item_room_filter_footer.xml    |  8 +--
 .../main/res/layout/item_room_invitation.xml  |  4 +-
 .../res/layout/item_room_to_add_in_space.xml  |  2 +-
 .../layout/item_room_to_manage_in_space.xml   |  4 +-
 .../main/res/layout/item_search_result.xml    |  6 +--
 .../main/res/layout/item_settings_button.xml  |  2 +-
 .../item_settings_button_single_line.xml      |  4 +-
 .../layout/item_settings_continue_cancel.xml  |  4 +-
 .../res/layout/item_settings_edit_text.xml    |  2 +-
 .../res/layout/item_settings_helper_info.xml  |  2 +-
 .../res/layout/item_settings_information.xml  |  2 +-
 .../layout/item_settings_section_title.xml    |  2 +-
 .../res/layout/item_settings_simple_item.xml  |  4 +-
 .../res/layout/item_settings_three_pid.xml    |  2 +-
 .../res/layout/item_simple_reaction_info.xml  |  2 +-
 vector/src/main/res/layout/item_space.xml     |  6 +--
 vector/src/main/res/layout/item_space_add.xml |  2 +-
 .../res/layout/item_space_beta_header.xml     |  6 +--
 .../main/res/layout/item_space_roomchild.xml  |  6 +--
 .../main/res/layout/item_space_subspace.xml   |  2 +-
 .../res/layout/item_space_top_summary.xml     |  4 +-
 vector/src/main/res/layout/item_sub_space.xml |  4 +-
 .../main/res/layout/item_suggested_room.xml   |  6 +--
 .../res/layout/item_timeline_event_base.xml   |  4 +-
 .../item_timeline_event_call_tile_stub.xml    | 10 ++--
 .../item_timeline_event_code_block_stub.xml   |  4 +-
 .../res/layout/item_timeline_event_create.xml |  2 +-
 .../item_timeline_event_day_separator.xml     |  2 +-
 .../item_timeline_event_default_stub.xml      |  2 +-
 .../layout/item_timeline_event_file_stub.xml  |  2 +-
 ...item_timeline_event_merged_header_stub.xml |  4 +-
 ...meline_event_merged_room_creation_stub.xml | 12 ++---
 .../item_timeline_event_merged_utd_stub.xml   |  6 +--
 .../item_timeline_event_notice_stub.xml       |  2 +-
 ...tem_timeline_event_option_buttons_stub.xml |  4 +-
 .../layout/item_timeline_event_poll_stub.xml  | 14 ++---
 .../item_timeline_event_redacted_stub.xml     |  2 +-
 .../item_timeline_event_status_tile_stub.xml  |  4 +-
 .../item_timeline_event_text_message_stub.xml |  2 +-
 .../item_timeline_event_verification_stub.xml | 10 ++--
 .../item_timeline_event_widget_stub.xml       |  2 +-
 .../res/layout/item_timeline_read_marker.xml  |  2 +-
 vector/src/main/res/layout/item_tos.xml       |  4 +-
 .../src/main/res/layout/item_unknown_room.xml |  2 +-
 .../src/main/res/layout/item_uploads_file.xml |  4 +-
 vector/src/main/res/layout/item_user.xml      |  4 +-
 .../item_user_directory_letter_header.xml     |  2 +-
 .../main/res/layout/item_user_list_header.xml |  2 +-
 .../res/layout/item_verification_action.xml   |  4 +-
 .../layout/item_verification_decimal_code.xml |  2 +-
 .../res/layout/item_verification_notice.xml   |  2 +-
 .../res/layout/item_verification_wait.xml     |  8 +--
 .../res/layout/item_verification_waiting.xml  |  2 +-
 .../media_upload_download_progress_layout.xml |  2 +-
 .../layout/merge_image_attachment_overlay.xml |  4 +-
 .../res/layout/merge_overlay_waiting_view.xml |  2 +-
 vector/src/main/res/layout/option_buttons.xml |  2 +-
 .../src/main/res/layout/reaction_button.xml   |  4 +-
 .../vector_home_badge_unread_layout.xml       |  2 +-
 .../main/res/layout/vector_invite_view.xml    |  6 +--
 .../layout/vector_preference_push_rule.xml    |  4 +-
 .../layout/view_active_conference_view.xml    |  4 +-
 .../view_bottom_sheet_action_button.xml       |  4 +-
 .../src/main/res/layout/view_button_state.xml |  4 +-
 .../main/res/layout/view_current_calls.xml    |  4 +-
 .../layout/view_failed_messages_warning.xml   |  4 +-
 vector/src/main/res/layout/view_file_icon.xml |  2 +-
 .../res/layout/view_jump_to_read_marker.xml   |  2 +-
 .../res/layout/view_keys_backup_banner.xml    |  4 +-
 .../res/layout/view_notification_area.xml     |  2 +-
 .../main/res/layout/view_poll_result_line.xml |  4 +-
 .../src/main/res/layout/view_read_marker.xml  |  2 +-
 .../main/res/layout/view_read_receipts.xml    |  2 +-
 .../res/layout/view_room_widgets_banner.xml   |  4 +-
 ...ew_sign_out_bottom_sheet_action_button.xml |  2 +-
 .../res/layout/view_space_type_button.xml     |  4 +-
 vector/src/main/res/layout/view_state.xml     |  6 +--
 .../view_stub_room_member_profile_header.xml  |  8 +--
 .../layout/view_stub_room_profile_header.xml  |  4 +-
 .../src/main/res/layout/view_sync_state.xml   |  6 +--
 .../src/main/res/layout/view_url_preview.xml  |  6 +--
 295 files changed, 819 insertions(+), 822 deletions(-)
 rename {vector => library/ui-styles}/src/main/res/color/bottom_navigation_icon_tint_selector.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/color/button_background_tint_selector.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/color/button_social_google_background_selector_dark.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/color/button_social_google_background_selector_light.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/color/color_primary_alpha25.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/bg_bottom_navigation.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/bg_pin_key.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/element_logo_green.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/file_progress_bar.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_search.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_social_apple.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_social_facebook.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_social_github.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_social_gitlab.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_social_google.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_social_twitter.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/ic_x_gray.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/pin_code_dot_empty.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/pin_code_dot_fill.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/pin_code_dots.xml (100%)
 rename {vector => library/ui-styles}/src/main/res/drawable/vector_label_background.xml (100%)

diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
index 6ff0d68078..ab7a33f258 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/videoMediaViewerErrorView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index 8010786a17..47c4664636 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -58,4 +58,6 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
     // PFLockScreen attrs
     implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
+    // dialpad dimen
+    implementation 'im.dlg:android-dialer:1.2.5'
 }
\ No newline at end of file
diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
index 1d10d3fb49..7d251b8af7 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
@@ -12,100 +12,100 @@
         android:orientation="vertical"
         android:padding="16dp">
 
-        <!-- Note: Default style is @style/VectorButtonStyle in the theme -->
+        <!-- Note: Default style is @style/Button.Vector.Style in the theme -->
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Button.Vector.Style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Default" />
 
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Button.Vector.Style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Line1\nLine 2" />
 
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Button.Vector.Style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Default disabled" />
 
         <Button
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Text" />
 
         <Button
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Text disabled" />
 
         <Button
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Positive" />
 
         <Button
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Positive disabled" />
 
         <Button
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Destructive" />
 
         <Button
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Destructive disabled" />
 
         <Button
-            style="@style/VectorButtonStyleUnelevated.Bot"
+            style="@style/Button.Vector.Style.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Bot" />
 
         <Button
-            style="@style/VectorButtonStyleUnelevated.Bot"
+            style="@style/Button.Vector.Style.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Bot disabled" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined"
+            style="@style/Button.Vector.Style.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
             android:text="Outline" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined"
+            style="@style/Button.Vector.Style.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Outline disabled" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Button.Vector.Style.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Poll " />
 
         <Button
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Button.Vector.Style.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
@@ -119,14 +119,14 @@
             android:padding="8dp">
 
             <Button
-                style="@style/AlerterButton"
+                style="@style/Button.Vector.Style.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="Alerter" />
 
             <Button
-                style="@style/AlerterButton"
+                style="@style/Button.Vector.Style.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="false"
diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
index 7e922fe741..eb80afd3a1 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
@@ -7,62 +7,62 @@
     tools:ignore="HardcodedText">
 
     <TextView
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceTitle\nline 2" />
+        android:text="TextAppearance.Vector.Title\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Title.M"
+        style="@style/TextView.Vector.Title.M"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceTitle.M\nline 2" />
+        android:text="TextAppearance.Vector.Title.M\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceHeadlineM\nline 2" />
+        android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceSubtitle\nline 2" />
+        android:text="TextAppearance.Vector.Subtitle\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle.M"
+        style="@style/TextView.Vector.Subtitle.M"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceSubtitle.M\nline 2" />
+        android:text="TextAppearance.Vector.Subtitle.M\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceBody\nline 2" />
+        android:text="TextAppearance.Vector.Body\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Body.M"
+        style="@style/TextView.Vector.Body.M"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceBody.M\nline 2" />
+        android:text="TextAppearance.Vector.Body.M\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceCaption\nline 2" />
+        android:text="TextAppearance.Vector.Caption\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceMicro\nline 2" />
+        android:text="TextAppearance.Vector.Micro\nline 2" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Default (VectorTextAppearanceBody)\nline 2" />
+        android:text="Default (TextAppearance.Vector.Body)\nline 2" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml b/library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
similarity index 100%
rename from vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
rename to library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
diff --git a/vector/src/main/res/color/button_background_tint_selector.xml b/library/ui-styles/src/main/res/color/button_background_tint_selector.xml
similarity index 100%
rename from vector/src/main/res/color/button_background_tint_selector.xml
rename to library/ui-styles/src/main/res/color/button_background_tint_selector.xml
diff --git a/vector/src/main/res/color/button_social_google_background_selector_dark.xml b/library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
similarity index 100%
rename from vector/src/main/res/color/button_social_google_background_selector_dark.xml
rename to library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
diff --git a/vector/src/main/res/color/button_social_google_background_selector_light.xml b/library/ui-styles/src/main/res/color/button_social_google_background_selector_light.xml
similarity index 100%
rename from vector/src/main/res/color/button_social_google_background_selector_light.xml
rename to library/ui-styles/src/main/res/color/button_social_google_background_selector_light.xml
diff --git a/vector/src/main/res/color/color_primary_alpha25.xml b/library/ui-styles/src/main/res/color/color_primary_alpha25.xml
similarity index 100%
rename from vector/src/main/res/color/color_primary_alpha25.xml
rename to library/ui-styles/src/main/res/color/color_primary_alpha25.xml
diff --git a/vector/src/main/res/drawable/bg_bottom_navigation.xml b/library/ui-styles/src/main/res/drawable/bg_bottom_navigation.xml
similarity index 100%
rename from vector/src/main/res/drawable/bg_bottom_navigation.xml
rename to library/ui-styles/src/main/res/drawable/bg_bottom_navigation.xml
diff --git a/vector/src/main/res/drawable/bg_pin_key.xml b/library/ui-styles/src/main/res/drawable/bg_pin_key.xml
similarity index 100%
rename from vector/src/main/res/drawable/bg_pin_key.xml
rename to library/ui-styles/src/main/res/drawable/bg_pin_key.xml
diff --git a/vector/src/main/res/drawable/element_logo_green.xml b/library/ui-styles/src/main/res/drawable/element_logo_green.xml
similarity index 100%
rename from vector/src/main/res/drawable/element_logo_green.xml
rename to library/ui-styles/src/main/res/drawable/element_logo_green.xml
diff --git a/vector/src/main/res/drawable/file_progress_bar.xml b/library/ui-styles/src/main/res/drawable/file_progress_bar.xml
similarity index 100%
rename from vector/src/main/res/drawable/file_progress_bar.xml
rename to library/ui-styles/src/main/res/drawable/file_progress_bar.xml
diff --git a/vector/src/main/res/drawable/ic_search.xml b/library/ui-styles/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_search.xml
rename to library/ui-styles/src/main/res/drawable/ic_search.xml
diff --git a/vector/src/main/res/drawable/ic_social_apple.xml b/library/ui-styles/src/main/res/drawable/ic_social_apple.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_apple.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_apple.xml
diff --git a/vector/src/main/res/drawable/ic_social_facebook.xml b/library/ui-styles/src/main/res/drawable/ic_social_facebook.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_facebook.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_facebook.xml
diff --git a/vector/src/main/res/drawable/ic_social_github.xml b/library/ui-styles/src/main/res/drawable/ic_social_github.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_github.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_github.xml
diff --git a/vector/src/main/res/drawable/ic_social_gitlab.xml b/library/ui-styles/src/main/res/drawable/ic_social_gitlab.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_gitlab.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_gitlab.xml
diff --git a/vector/src/main/res/drawable/ic_social_google.xml b/library/ui-styles/src/main/res/drawable/ic_social_google.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_google.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_google.xml
diff --git a/vector/src/main/res/drawable/ic_social_twitter.xml b/library/ui-styles/src/main/res/drawable/ic_social_twitter.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_twitter.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_twitter.xml
diff --git a/vector/src/main/res/drawable/ic_x_gray.xml b/library/ui-styles/src/main/res/drawable/ic_x_gray.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_x_gray.xml
rename to library/ui-styles/src/main/res/drawable/ic_x_gray.xml
diff --git a/vector/src/main/res/drawable/pin_code_dot_empty.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
similarity index 100%
rename from vector/src/main/res/drawable/pin_code_dot_empty.xml
rename to library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
diff --git a/vector/src/main/res/drawable/pin_code_dot_fill.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
similarity index 100%
rename from vector/src/main/res/drawable/pin_code_dot_fill.xml
rename to library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
diff --git a/vector/src/main/res/drawable/pin_code_dots.xml b/library/ui-styles/src/main/res/drawable/pin_code_dots.xml
similarity index 100%
rename from vector/src/main/res/drawable/pin_code_dots.xml
rename to library/ui-styles/src/main/res/drawable/pin_code_dots.xml
diff --git a/vector/src/main/res/drawable/vector_label_background.xml b/library/ui-styles/src/main/res/drawable/vector_label_background.xml
similarity index 100%
rename from vector/src/main/res/drawable/vector_label_background.xml
rename to library/ui-styles/src/main/res/drawable/vector_label_background.xml
diff --git a/library/ui-styles/src/main/res/values/style_snackbar.xml b/library/ui-styles/src/main/res/values/style_snackbar.xml
index 60c78c0e65..d1c7319813 100644
--- a/library/ui-styles/src/main/res/values/style_snackbar.xml
+++ b/library/ui-styles/src/main/res/values/style_snackbar.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorSnackBarStyle" parent="@style/Widget.MaterialComponents.Snackbar">
+    <style name="SnackBar.Vector.Style" parent="@style/Widget.MaterialComponents.Snackbar">
 <!--        <item name="android:background">@color/notification_accent_color</item>-->
     </style>
 
-    <style name="VectorSnackBarButton" parent="@style/VectorButtonStyleText.OnPrimary">
+    <style name="SnackBar.Vector.Button" parent="@style/Button.Vector.Style.Text.OnPrimary">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 
-    <style name="VectorSnackBarText" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+    <style name="SnackBar.Vector.Text" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/styles.xml b/library/ui-styles/src/main/res/values/styles.xml
index 8cc1fe70d8..b028d2e219 100644
--- a/library/ui-styles/src/main/res/values/styles.xml
+++ b/library/ui-styles/src/main/res/values/styles.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Vector.PopupMenu" parent="Vector.PopupMenuBase" />
-
     <style name="VectorEmptyImageView">
         <item name="android:visibility">visible</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_alert_dialog.xml b/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
index 08ce9d4dda..283a1ab1ca 100644
--- a/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
+++ b/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorAlertDialogStyleLight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="AlertDialog.Vector.Light" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="colorPrimary">@color/palette_element_green</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_system_light</item>
@@ -13,7 +13,7 @@
         <item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
     </style>
 
-    <style name="VectorAlertDialogStyleDark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="AlertDialog.Vector.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="colorPrimary">@color/palette_element_green</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_system_dark</item>
diff --git a/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml b/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
index ddd5e7d30a..8925d6a74f 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorBottomNavigation" parent="Widget.MaterialComponents.BottomNavigationView">
+    <style name="BottomNavigation.Vector" parent="Widget.MaterialComponents.BottomNavigationView">
         <item name="android:background">@drawable/bg_bottom_navigation</item>
         <item name="itemBackground">@drawable/bg_bottom_navigation</item>
         <item name="itemIconSize">20dp</item>
diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index f244a80969..8d1511f405 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <!-- BottomSheet theming -->
-    <style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+    <style name="BottomSheet.Vector.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_light</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_light</item>
@@ -13,7 +13,7 @@
         <item name="android:textColorLink">@color/element_link_light</item>
     </style>
 
-    <style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
+    <style name="BottomSheet.Vector.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_dark</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_dark</item>
@@ -24,7 +24,7 @@
         <item name="android:textColorLink">@color/element_link_dark</item>
     </style>
 
-    <style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
+    <style name="BottomSheet.Vector.Black" parent="BottomSheet.Vector.Dark">
         <item name="colorSurface">@color/element_background_black</item>
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
index a8c2508c25..3d779fe115 100644
--- a/library/ui-styles/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorButtonStyle" parent="Widget.MaterialComponents.Button">
+    <style name="Button.Vector.Style" parent="Widget.MaterialComponents.Button">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyle.Destructive">
+    <style name="Button.Vector.Style.Destructive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
     </style>
@@ -18,7 +18,7 @@
         <item name="colorPrimary">?colorError</item>
     </style>
 
-    <style name="VectorButtonStyle.Positive">
+    <style name="Button.Vector.Style.Positive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
     </style>
@@ -27,15 +27,15 @@
         <!-- Keep default colors from the theme -->
     </style>
 
-    <style name="VectorButtonStyleUnelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+    <style name="Button.Vector.Style.Unelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyleUnelevated.Bot">
+    <style name="Button.Vector.Style.Unelevated.Bot">
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayBot</item>
     </style>
 
@@ -44,27 +44,27 @@
         <item name="colorOnPrimary">@color/button_bot_enabled_text_color</item>
     </style>
 
-    <style name="VectorButtonStyleText" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Button.Vector.Style.Text" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="colorControlHighlight">?colorSecondary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyleText.OnPrimary">
+    <style name="Button.Vector.Style.Text.OnPrimary">
         <item name="colorControlHighlight">?colorOnPrimary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
     </style>
 
-    <style name="VectorButtonStyleOutlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Button.Vector.Style.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textAllCaps">false</item>
         <item name="strokeColor">@color/button_background_tint_selector</item>
         <item name="strokeWidth">1dp</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="AlerterButton" parent="VectorButtonStyleText">
+    <style name="Button.Vector.Style.Text.Alerter">
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">false</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
@@ -74,7 +74,7 @@
         <item name="colorPrimary">?colorOnPrimary</item>
     </style>
 
-    <style name="VectorButtonStyleOutlined.Poll">
+    <style name="Button.Vector.Style.Outlined.Poll">
         <item name="android:minHeight">44dp</item>
         <item name="cornerRadius">10dp</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
index 586e77ffe7..f0703135fa 100644
--- a/library/ui-styles/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -2,9 +2,9 @@
 <resources>
 
     <!-- Default style for TextInputLayout -->
-    <style name="VectorTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
+    <style name="TextInputLayout.Vector" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
 
-    <style name="ComposerEditTextStyle" parent="Widget.AppCompat.EditText">
+    <style name="EditText.Vector.Composer" parent="Widget.AppCompat.EditText">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
         <item name="android:maxLines">12</item>
@@ -14,10 +14,4 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
-    <!-- Styles for login screen -->
-    <style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
-        <item name="android:textSize">16sp</item>
-    </style>
-
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_login.xml b/library/ui-styles/src/main/res/values/styles_login.xml
index 8cba34daf3..a5293dcb66 100644
--- a/library/ui-styles/src/main/res/values/styles_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_login.xml
@@ -35,17 +35,17 @@
         <item name="android:paddingBottom">32dp</item>
     </style>
 
-    <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
+    <style name="Button.Vector.Style.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
+    <style name="Button.Vector.Style.Login.Outlined" parent="Button.Vector.Style.Outlined">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Text" parent="VectorButtonStyleText">
+    <style name="Button.Vector.Style.Login.Text" parent="Button.Vector.Style.Text">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_pin_code.xml b/library/ui-styles/src/main/res/values/styles_pin_code.xml
index 61f53ab522..11ededa2f0 100644
--- a/library/ui-styles/src/main/res/values/styles_pin_code.xml
+++ b/library/ui-styles/src/main/res/values/styles_pin_code.xml
@@ -15,7 +15,7 @@
         <item name="android:button">@drawable/pin_code_dots</item>
     </style>
 
-    <style name="PinCodeNextButtonStyle" parent="VectorButtonStyle">
+    <style name="PinCodeNextButtonStyle" parent="Button.Vector.Style">
         <item name="android:textSize">18sp</item>
         <item name="android:backgroundTint">@android:color/transparent</item>
         <item name="android:layout_marginBottom">24dp</item>
diff --git a/library/ui-styles/src/main/res/values/styles_popup.xml b/library/ui-styles/src/main/res/values/styles_popup.xml
index dbc292b8c8..c7b089e94c 100644
--- a/library/ui-styles/src/main/res/values/styles_popup.xml
+++ b/library/ui-styles/src/main/res/values/styles_popup.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Vector.PopupMenuBase" parent="Widget.AppCompat.PopupMenu">
+    <style name="PopupMenu.Vector.Base" parent="Widget.AppCompat.PopupMenu">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:textSize">16sp</item>
         <item name="android:dropDownHorizontalOffset">0dp</item>
         <item name="android:dropDownVerticalOffset">0dp</item>
     </style>
 
+    <style name="PopupMenu.Vector" parent="PopupMenu.Vector.Base" />
+
+
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_progress.xml b/library/ui-styles/src/main/res/values/styles_progress.xml
index 73e8a075e1..fa976f3ba7 100644
--- a/library/ui-styles/src/main/res/values/styles_progress.xml
+++ b/library/ui-styles/src/main/res/values/styles_progress.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="FileProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
+    <style name="ProgressBar.Vector.File" parent="Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:indeterminateOnly">false</item>
         <item name="android:progressDrawable">@drawable/file_progress_bar</item>
         <item name="android:minHeight">10dp</item>
         <item name="android:maxHeight">40dp</item>
     </style>
 
-    <style name="VectorHorizontalProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
+    <style name="ProgressBar.Vector.Horizontal" parent="Widget.AppCompat.ProgressBar.Horizontal" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_search_view.xml b/library/ui-styles/src/main/res/values/styles_search_view.xml
index 5cf6db538f..a714b1aac2 100644
--- a/library/ui-styles/src/main/res/values/styles_search_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_search_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
+    <style name="SearchView.Vector" parent="Widget.AppCompat.SearchView">
         <item name="searchIcon">@drawable/ic_search</item>
         <item name="closeIcon">@drawable/ic_x_gray</item>
         <item name="iconifiedByDefault">false</item>
diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index 04a15566de..dd662eb3ba 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="WidgetButtonSocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Button.Vector.SocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textAllCaps">false</item>
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:layout_width">wrap_content</item>
@@ -17,44 +17,44 @@
         <item name="strokeColor">@color/black_54</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Google">
+    <style name="Button.Vector.SocialLogin.Google">
         <item name="icon">@drawable/ic_social_google</item>
         <item name="iconTint">@android:color/transparent</item>
         <item name="iconTintMode">add</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Google.Light">
+    <style name="Button.Vector.SocialLogin.Google.Light">
         <item name="android:backgroundTint">@color/button_social_google_background_selector_light</item>
         <item name="android:textColor">@color/black_54</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Google.Dark">
+    <style name="Button.Vector.SocialLogin.Google.Dark">
         <item name="android:backgroundTint">@color/button_social_google_background_selector_dark</item>
         <item name="android:textColor">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Github" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Github">
         <item name="icon">@drawable/ic_social_github</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Github.Light">
+    <style name="Button.Vector.SocialLogin.Github.Light">
         <item name="iconTint">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Github.Dark">
+    <style name="Button.Vector.SocialLogin.Github.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
 
-    <style name="WidgetButtonSocialLogin.Facebook" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Facebook">
         <item name="icon">@drawable/ic_social_facebook</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Facebook.Light">
+    <style name="Button.Vector.SocialLogin.Facebook.Light">
         <item name="strokeColor">#3877EA</item>
         <item name="strokeWidth">1dp</item>
         <item name="iconTint">#3877EA</item>
@@ -62,58 +62,58 @@
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Facebook.Dark">
+    <style name="Button.Vector.SocialLogin.Facebook.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">#3877EA</item>
     </style>
 
 
-    <style name="WidgetButtonSocialLogin.Twitter" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Twitter">
         <item name="icon">@drawable/ic_social_twitter</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Twitter.Light">
+    <style name="Button.Vector.SocialLogin.Twitter.Light">
         <item name="iconTint">#5D9EC9</item>
         <item name="android:textColor">#5D9EC9</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Twitter.Dark">
+    <style name="Button.Vector.SocialLogin.Twitter.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">#5D9EC9</item>
     </style>
 
 
-    <style name="WidgetButtonSocialLogin.Apple" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Apple">
         <item name="icon">@drawable/ic_social_apple</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Apple.Light">
+    <style name="Button.Vector.SocialLogin.Apple.Light">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Apple.Dark">
+    <style name="Button.Vector.SocialLogin.Apple.Dark">
         <item name="iconTint">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Gitlab" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Gitlab">
         <item name="icon">@drawable/ic_social_gitlab</item>
         <item name="iconTint">@android:color/transparent</item>
         <item name="iconTintMode">add</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Gitlab.Light">
+    <style name="Button.Vector.SocialLogin.Gitlab.Light">
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Gitlab.Dark">
+    <style name="Button.Vector.SocialLogin.Gitlab.Dark">
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
index 59bea680fe..bf44fd0245 100644
--- a/library/ui-styles/src/main/res/values/styles_text_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorTextView" parent="Widget.MaterialComponents.TextView" />
+    <style name="TextView.Vector" parent="Widget.MaterialComponents.TextView" />
 
     <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
-    <style name="VectorTextView.Title">
-        <item name="android:textAppearance">@style/VectorTextAppearanceTitle</item>
+    <style name="TextView.Vector.Title">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
         <item name="lineHeight">32sp</item>
     </style>
 
-    <style name="VectorTextView.Title.M">
-        <item name="android:textAppearance">@style/VectorTextAppearanceTitle.M</item>
+    <style name="TextView.Vector.Title.M">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Title.M</item>
     </style>
 
-    <style name="VectorTextView.HeadlineM">
-        <item name="android:textAppearance">@style/VectorTextAppearanceHeadlineM</item>
+    <style name="TextView.Vector.HeadlineM">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
     </style>
 
-    <style name="VectorTextView.Subtitle">
-        <item name="android:textAppearance">@style/VectorTextAppearanceSubtitle</item>
+    <style name="TextView.Vector.Subtitle">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
     </style>
 
-    <style name="VectorTextView.Subtitle.M">
-        <item name="android:textAppearance">@style/VectorTextAppearanceSubtitle.M</item>
+    <style name="TextView.Vector.Subtitle.M">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.M</item>
     </style>
 
-    <style name="VectorTextView.Body">
-        <item name="android:textAppearance">@style/VectorTextAppearanceBody</item>
+    <style name="TextView.Vector.Body">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
         <item name="lineHeight">20sp</item>
     </style>
 
-    <style name="VectorTextView.Body.M">
-        <item name="android:textAppearance">@style/VectorTextAppearanceBody.M</item>
+    <style name="TextView.Vector.Body.M">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.M</item>
     </style>
 
-    <style name="VectorTextView.Caption">
-        <item name="android:textAppearance">@style/VectorTextAppearanceCaption</item>
+    <style name="TextView.Vector.Caption">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
         <item name="lineHeight">16sp</item>
     </style>
 
-    <style name="VectorTextView.Micro">
-        <item name="android:textAppearance">@style/VectorTextAppearanceMicro</item>
+    <style name="TextView.Vector.Micro">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
         <item name="lineHeight">16sp</item>
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
index 3131148996..ab18abfdab 100644
--- a/library/ui-styles/src/main/res/values/styles_toolbar.xml
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorAppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
+    <style name="AppBarLayout.Vector.Style" parent="Widget.MaterialComponents.AppBarLayout.Primary">
         <item name="android:background">?vctr_toolbar_background</item>
         <item name="elevation">4dp</item>
     </style>
 
-    <style name="VectorToolbarBase" parent="Widget.MaterialComponents.Toolbar">
+    <style name="Toolbar.Vector.Base" parent="Widget.MaterialComponents.Toolbar">
         <item name="android:background">?vctr_toolbar_background</item>
         <item name="elevation">0dp</item>
 
         <!-- main text -->
-        <item name="titleTextStyle">@style/ActionBarTitleText</item>
+        <item name="titleTextStyle">@style/TextView.Vector.ActrionBarTitle</item>
 
         <!-- sub text -->
-        <item name="subtitleTextStyle">@style/ActionBarSubTitleText</item>
+        <item name="subtitleTextStyle">@style/TextView.Vector.ActrionBarSubTitle</item>
     </style>
 
     <!-- Default toolbar style -->
-    <style name="VectorToolbar" parent="VectorToolbarBase">
+    <style name="Toolbar.Vector" parent="Toolbar.Vector.Base">
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>
 
     <!-- Toolbar for settings Activity (so we keep the default contentInsetStartWithNavigation here) -->
-    <style name="VectorToolbarSettings" parent="VectorToolbarBase" />
+    <style name="Toolbar.Vector.Settings" parent="Toolbar.Vector.Base" />
 
     <!-- Toolbar text style -->
     <!-- main text -->
-    <style name="ActionBarTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+    <style name="TextView.Vector.ActrionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:fontFamily">"sans-serif-medium"</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <!-- sub text -->
-    <style name="ActionBarSubTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
+    <style name="TextView.Vector.ActrionBarSubTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:fontFamily">"sans-serif-medium"</item>
         <item name="android:textSize">12sp</item>
     </style>
 
     <!-- Action mode style -->
-    <style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
+    <style name="ActionMode.Vector.Style" parent="Widget.AppCompat.ActionMode">
         <item name="background">?android:colorBackground</item>
-        <item name="titleTextStyle">@style/VectorTextView.Title</item>
-        <item name="subtitleTextStyle">@style/VectorTextView.Subtitle</item>
+        <item name="titleTextStyle">@style/TextView.Vector.Title</item>
+        <item name="subtitleTextStyle">@style/TextView.Vector.Subtitle</item>
         <item name="actionMenuTextColor">?colorOnPrimary</item>
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index e938cb5a98..a54c6a2258 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -5,7 +5,7 @@
       List of supported attributes for a TextAppearance:
       https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723-->
 
-    <style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
+    <style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">24sp</item>
@@ -13,12 +13,12 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="VectorTextAppearanceTitle.M">
+    <style name="TextAppearance.Vector.Title.M">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="VectorTextAppearanceHeadlineM" parent="TextAppearance.MaterialComponents.Headline1">
+    <style name="TextAppearance.Vector.Headline.Medium" parent="TextAppearance.MaterialComponents.Headline1">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">18sp</item>
@@ -26,7 +26,7 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="VectorTextAppearanceSubtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
+    <style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">16sp</item>
@@ -34,13 +34,13 @@
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="VectorTextAppearanceSubtitle.M">
+    <style name="TextAppearance.Vector.Subtitle.M">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <!-- Note: this is the default text appearance for all the TextViews -->
-    <style name="VectorTextAppearanceBody" parent="TextAppearance.MaterialComponents.Body1">
+    <style name="TextAppearance.Vector.Body" parent="TextAppearance.MaterialComponents.Body1">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">14sp</item>
@@ -48,12 +48,12 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="VectorTextAppearanceBody.M">
+    <style name="TextAppearance.Vector.Body.M">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="VectorTextAppearanceCaption" parent="TextAppearance.MaterialComponents.Caption">
+    <style name="TextAppearance.Vector.Caption" parent="TextAppearance.MaterialComponents.Caption">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">12sp</item>
@@ -61,14 +61,14 @@
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="VectorTextAppearanceMicro" parent="TextAppearance.MaterialComponents.Caption">
+    <style name="TextAppearance.Vector.Micro" parent="TextAppearance.MaterialComponents.Caption">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">10sp</item>
         <item name="android:letterSpacing">0</item>
     </style>
 
-    <style name="VectorTextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
+    <style name="TextAppearance.Vector.Button" parent="TextAppearance.MaterialComponents.Button">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">16sp</item>
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index 98ab4213c3..0cce560b52 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -25,7 +25,7 @@
         <item name="colorSurface">@android:color/black</item>
         <item name="android:colorBackground">@color/element_background_black</item>
 
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Black</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Black</item>
 
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:navigationBarColor">@android:color/black</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 741a76afca..a5188131b2 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -63,30 +63,30 @@
         <item name="colorOnBackground">?vctr_content_primary</item>
 
         <!--Material type attributes-->
-        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
-        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <item name="textAppearanceButton">@style/TextAppearance.Vector.Button</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
         <!-- Default Text appearance for TextViews -->
-        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
         <!-- Text appearance for List item (TODO Check that this is used in Preference Screen -->
-        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
-        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
-        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
+        <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/VectorTextView.Body</item>
-        <item name="materialButtonStyle">@style/VectorButtonStyle</item>
-        <item name="toolbarStyle">@style/VectorToolbar</item>
-        <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
-        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
-        <item name="searchViewStyle">@style/VectorSearchView</item>
-        <item name="textInputStyle">@style/VectorTextInputLayout</item>
-        <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-        <item name="actionModeStyle">@style/VectorActionMode</item>
+        <item name="android:textViewStyle">@style/TextView.Vector.Body</item>
+        <item name="materialButtonStyle">@style/Button.Vector.Style</item>
+        <item name="toolbarStyle">@style/Toolbar.Vector</item>
+        <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Dark</item>
+        <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
+        <item name="searchViewStyle">@style/SearchView.Vector</item>
+        <item name="textInputStyle">@style/TextInputLayout.Vector</item>
+        <item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Vector</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Dark</item>
+        <item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
+        <item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
+        <item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
+        <item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
 
         <item name="android:textColorLink">@color/element_link_dark</item>
 
@@ -124,12 +124,12 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/WidgetButtonSocialLogin.Google.Dark</item>
-        <item name="vctr_social_login_button_github_style">@style/WidgetButtonSocialLogin.Github.Dark</item>
-        <item name="vctr_social_login_button_facebook_style">@style/WidgetButtonSocialLogin.Facebook.Dark</item>
-        <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Dark</item>
-        <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Dark</item>
-        <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Dark</item>
+        <item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Dark</item>
+        <item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Dark</item>
+        <item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Dark</item>
+        <item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Dark</item>
+        <item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Dark</item>
+        <item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Dark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 6047278ad2..d2c659a599 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -63,30 +63,30 @@
         <item name="colorOnBackground">?vctr_content_primary</item>
 
         <!--Material type attributes-->
-        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
-        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <item name="textAppearanceButton">@style/TextAppearance.Vector.Button</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
         <!-- Default Text appearance for TextViews -->
-        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
         <!-- Text appearance for List item -->
-        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
-        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
-        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
+        <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/VectorTextView.Body</item>
-        <item name="materialButtonStyle">@style/VectorButtonStyle</item>
-        <item name="toolbarStyle">@style/VectorToolbar</item>
-        <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>
-        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
-        <item name="searchViewStyle">@style/VectorSearchView</item>
-        <item name="textInputStyle">@style/VectorTextInputLayout</item>
-        <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-        <item name="actionModeStyle">@style/VectorActionMode</item>
+        <item name="android:textViewStyle">@style/TextView.Vector.Body</item>
+        <item name="materialButtonStyle">@style/Button.Vector.Style</item>
+        <item name="toolbarStyle">@style/Toolbar.Vector</item>
+        <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Light</item>
+        <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
+        <item name="searchViewStyle">@style/SearchView.Vector</item>
+        <item name="textInputStyle">@style/TextInputLayout.Vector</item>
+        <item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Vector</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Light</item>
+        <item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
+        <item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
+        <item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
+        <item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
 
         <item name="android:textColorLink">@color/element_link_light</item>
 
@@ -126,12 +126,12 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/WidgetButtonSocialLogin.Google.Light</item>
-        <item name="vctr_social_login_button_github_style">@style/WidgetButtonSocialLogin.Github.Light</item>
-        <item name="vctr_social_login_button_facebook_style">@style/WidgetButtonSocialLogin.Facebook.Light</item>
-        <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Light</item>
-        <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Light</item>
-        <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Light</item>
+        <item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Light</item>
+        <item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Light</item>
+        <item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Light</item>
+        <item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Light</item>
+        <item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Light</item>
+        <item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Light</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
index dbbd7270d7..838269f156 100644
--- a/tools/check/forbidden_strings_in_layout.txt
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -23,5 +23,5 @@
 
 # Extension:xml
 
-### Use style="@style/VectorTextView.*" instead of textSize attribute
+### Use style="@style/TextView.Vector.*" instead of textSize attribute
 android:textSize===9
diff --git a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
index 168faae1a3..88ea941b15 100644
--- a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
+++ b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/message"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="${fragmentClass}"
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index ee2f068f1e..3c77c70408 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/sas_emoji_index"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="32dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/sas_emoji"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/sas_emoji_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/sas_emoji_text_id"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 3228ffa6e1..3c4e233c7c 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -231,7 +231,7 @@ class PopupAlertManager @Inject constructor() {
                         setIcon(it)
                     }
                     alert.actions.forEach { action ->
-                        addButton(action.title, R.style.AlerterButton) {
+                        addButton(action.title, R.style.Button_Vector_Style_Text_Alerter) {
                             if (action.autoClose) {
                                 currentIsDismissed()
                                 Alerter.hide()
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index c59627454a..46f3347391 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/bug_report_progress_text_view"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -64,7 +64,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_first_text"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -93,7 +93,7 @@
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -103,7 +103,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_logs_description"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index aa84e01e06..cb8b2f3b7c 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -98,7 +98,7 @@
 
     <TextView
         android:id="@+id/participantNameText"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -114,7 +114,7 @@
 
     <TextView
         android:id="@+id/callStatusText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -130,7 +130,7 @@
 
     <Button
         android:id="@+id/callActionText"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_margin="8dp"
diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml
index ee3833b241..bd4b7bcfca 100644
--- a/vector/src/main/res/layout/activity_call_transfer.xml
+++ b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -60,7 +60,7 @@
 
             <TextView
                 android:id="@+id/callTransferConsultTitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -72,7 +72,7 @@
 
             <Button
                 android:id="@+id/callTransferConnectAction"
-                style="@style/VectorButtonStyleText"
+                style="@style/Button.Vector.Style.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml
index 1f50dd55a2..1cb6cf47a2 100644
--- a/vector/src/main/res/layout/activity_signed_out.xml
+++ b/vector/src/main/res/layout/activity_signed_out.xml
@@ -17,14 +17,14 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/signed_out_title"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <Button
                 android:id="@+id/signedOutSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index f664d4c60d..a6a722e576 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -15,10 +15,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <!-- Use VectorToolbarSettings on this screen for better alignment with setting items -->
+            <!-- Use Toolbar.Vector.Settings on this screen for better alignment with setting items -->
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/settingsToolbar"
-                style="@style/VectorToolbarSettings"
+                style="@style/Toolbar.Vector.Settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:navigationIcon="@drawable/ic_back_24dp"
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index e0fae2741b..c29a08c690 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/incomingCallNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/incomingCallKindView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 2b484dc4ee..ed47759c83 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -44,7 +44,7 @@
 
         <TextView
             android:id="@+id/tvTitle"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
@@ -58,7 +58,7 @@
 
         <TextView
             android:id="@+id/tvText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 512e596fc8..440248b9df 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -31,7 +31,7 @@
 
         <TextView
             android:id="@+id/bootstrapTitleText"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
index cfc6716c0c..4870bdebb6 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
@@ -16,7 +16,7 @@
 
         <TextView
             android:id="@+id/callDialPadTitle"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
index 89c253e6bc..491fdeda3a 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bottomSheetTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index dc4bb457cd..8660eb4bb5 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/inviterText"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -49,7 +49,7 @@
 
             <TextView
                 android:id="@+id/inviterMxid"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index 589e237789..5e4874410a 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -11,7 +11,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_signout_warning_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/backupStatusText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index f99dff6e51..5a65e41ba5 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -11,7 +11,7 @@
 
 
     <TextView
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/widgetPermissionHeader2"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -57,7 +57,7 @@
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerDisplayName"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
@@ -67,7 +67,7 @@
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerId"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
@@ -80,7 +80,7 @@
 
     <TextView
         android:id="@+id/widgetPermissionSharedInfo"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -99,7 +99,7 @@
 
         <Button
             android:id="@+id/widgetPermissionDecline"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
@@ -108,7 +108,7 @@
 
         <Button
             android:id="@+id/widgetPermissionContinue"
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index fdc3a49ae9..2189074749 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -10,7 +10,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/keys_backup_setup_step3_copy_button_title"
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/keys_backup_recovery_key_text"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -52,7 +52,7 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -85,7 +85,7 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index e0b6dfc531..a1109734f9 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/headerText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/descriptionText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
@@ -63,7 +63,7 @@
 
     <!--    <Button-->
     <!--        android:id="@+id/skipButton"-->
-    <!--        style="@style/VectorButtonStyleOutlined"-->
+    <!--        style="@style/Button.Vector.Style.Outlined"-->
     <!--        android:layout_width="match_parent"-->
     <!--        android:layout_height="wrap_content"-->
     <!--        android:layout_marginTop="@dimen/layout_vertical_margin"-->
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 0b1cf98d49..b4138a1963 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/headerText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 5559c8dc8b..6829e7924f 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/spaceNameView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -56,7 +56,7 @@
 
         <TextView
             android:id="@+id/spaceDescription"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 13316b2587..65b00219d3 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/otherUserNameText"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index 3816c206b4..4a78b34ec2 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -104,7 +104,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/ComposerEditTextStyle"
+        style="@style/EditText.Vector.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index 079bc9705a..a17c9689f0 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -135,7 +135,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/ComposerEditTextStyle"
+        style="@style/EditText.Vector.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/room_message_placeholder_not_encrypted"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index e40351b21d..7a0790788d 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
@@ -68,7 +68,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageContent"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -147,7 +147,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/ComposerEditTextStyle"
+        style="@style/EditText.Vector.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index 5339e7dc61..a3cd0ca372 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/cart_badge"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:background="@drawable/bg_unread_highlight"
diff --git a/vector/src/main/res/layout/dialog_background_sync_mode.xml b/vector/src/main/res/layout/dialog_background_sync_mode.xml
index a644de6df1..b9ddd7db4d 100644
--- a/vector/src/main/res/layout/dialog_background_sync_mode.xml
+++ b/vector/src/main/res/layout/dialog_background_sync_mode.xml
@@ -17,7 +17,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_battery"
@@ -25,7 +25,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -43,7 +43,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_real_time"
@@ -51,7 +51,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -69,7 +69,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_disabled"
@@ -77,7 +77,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
index 37fb66d269..743243358c 100644
--- a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
+++ b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/dialogConfirmationText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index 5472149f63..77e509ba54 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -13,14 +13,14 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/encryption_information_verify_device_warning" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -29,13 +29,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_name"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device name" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -44,13 +44,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_id"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device id" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -59,13 +59,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_key"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device key" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index bdee2e9b44..398694e9a5 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/disclaimerTextView"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/disclaimer_title"
@@ -52,7 +52,7 @@
         app:layout_constraintTop_toBottomOf="@id/disclaimerIconsLayout" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
index de4837d7ed..f41eaaf072 100644
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ b/vector/src/main/res/layout/dialog_event_content.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/event_content_text_view"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
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 a9388b1860..6b5b12f2a1 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/exportDialogText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/encryption_export_notice"
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 aeb6398097..14f0c44bc0 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/dialog_e2e_keys_passphrase_filename"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/dialog_no_sticker_pack.xml b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
index 7559382f34..d1c205c920 100644
--- a/vector/src/main/res/layout/dialog_no_sticker_pack.xml
+++ b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:drawablePadding="16dp"
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index 49fd1d15fd..d10ec2eff4 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -14,7 +14,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 1243ab27bf..f79f5e86a0 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
-                style="@style/VectorTextView.HeadlineM"
+                style="@style/TextView.Vector.HeadlineM"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/keepItSafeText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
index 80acd89474..62891c6ad7 100644
--- a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
+++ b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
@@ -13,7 +13,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/ssl_explanation"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -29,7 +29,7 @@
 
         <TextView
             android:id="@+id/ssl_user_id"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint_title"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -45,14 +45,14 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="12dp"
             tools:text="07 89 7A A0 30 82 99 95 E6 17 5D 1F 34 5D 8D 0C 67 82 63 1C 1F 57 20 75 42 91 F7 8B 28 03 54 A2" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
index 9c4e2b3bdf..e1af418712 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/bootstrapConclusionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index 2cc70d8edb..389ab1ff09 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -58,7 +58,7 @@
 
     <Button
         android:id="@+id/bootstrapPasswordButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index d80c612b47..e7676feb05 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/bootstrapWarningInfo"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -76,7 +76,7 @@
 
     <Button
         android:id="@+id/bootstrapSubmit"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/_continue"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index d9ec278c7a..bc79350162 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -41,7 +41,7 @@
 
         <Button
             android:id="@+id/bootstrapMigrateUseFile"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/use_file"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/bootstrapMigrateForgotPassphrase"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/bootstrapMigrateContinueButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index d8e04fba57..43e3c7bfe3 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/reAuthFailureText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -40,7 +40,7 @@
 
     <Button
         android:id="@+id/bootstrapCancelButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -49,7 +49,7 @@
 
     <Button
         android:id="@+id/bootstrapRetryButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index f0661eec8d..a173abe69f 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapSaveText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/bootstrapRecoveryKeyText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 69a79ab59c..ab697048b3 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapSetupSecureText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/bootstrapSetupWarningTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index fe4a99c6c6..b78c3901cf 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/bootstrapLoadingStatusText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index 9033a1fab3..b2d49d26fe 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/phoneBookTitle"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -92,7 +92,7 @@
 
             <Button
                 android:id="@+id/phoneBookSearchForMatrixContacts"
-                style="@style/VectorButtonStyleText"
+                style="@style/Button.Vector.Style.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 77729fe4e0..bdd02c3340 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/createDirectRoomTitle"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index a461fd55dc..41678d7811 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -40,7 +40,7 @@
 
                     <TextView
                         android:id="@+id/createRoomTitle"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index bd343d8983..36d7036fd2 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/deactivateAccountContent"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/deactivate_account_content"
@@ -33,7 +33,7 @@
 
         <Button
             android:id="@+id/deactivateAccountSubmit"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index ad95f98fab..529b213f16 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -46,7 +46,7 @@
 
                     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
                         android:id="@+id/drawerUnreadCounterBadgeView"
-                        style="@style/VectorTextView.Micro"
+                        style="@style/TextView.Vector.Micro"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
@@ -77,7 +77,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarTitleView"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
@@ -89,7 +89,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarSpaceTitleView"
-                        style="@style/VectorTextView.Subtitle"
+                        style="@style/TextView.Vector.Subtitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 4a1421c61e..12c2fc4ef8 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/homeDrawerUsernameView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
         <TextView
             android:id="@+id/homeDrawerUserIdView"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -78,7 +78,7 @@
 
         <Button
             android:id="@+id/homeDrawerInviteFriendButton"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginTop="8dp"
@@ -130,7 +130,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSettingsView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
@@ -149,7 +149,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSignoutView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index f108344c5c..60533b365c 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/keys_restore_with_key"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -77,7 +77,7 @@
 
         <TextView
             android:id="@+id/keys_restore_key_help_with_link"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index 3c7dd9f38e..bdf92a402d 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/keys_backup_restore_with_passphrase"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -74,7 +74,7 @@
 
         <TextView
             android:id="@+id/helperTextWithLink"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index c8a57d477c..cb0cce68c8 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/success_text"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/success_details_text"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index 36b0158156..932c7f73da 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_title"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -39,7 +39,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -66,7 +66,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_advanced_option_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -83,7 +83,7 @@
 
     <Button
         android:id="@+id/keys_backup_setup_step1_manual_export_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_margin="16dp"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 007eb596f2..7319471f1e 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_title"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -120,7 +120,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_recovery_key_alternative"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -133,7 +133,7 @@
 
         <Button
             android:id="@+id/keys_backup_setup_step2_skip_button"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index e2d932e851..8ab6561a7d 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -43,7 +43,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_line1_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -55,7 +55,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_label2"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -68,7 +68,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_recovery_key_text"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_horizontal_margin"
@@ -82,7 +82,7 @@
 
         <Button
             android:id="@+id/keys_backup_setup_step3_copy_button"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 4b801f7a4d..7177bd2543 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -35,7 +35,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -101,7 +101,7 @@
 
             <TextView
                 android:id="@+id/loginPasswordNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -117,7 +117,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -125,7 +125,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -147,7 +147,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index cb6f2fb95b..50a78b8881 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -25,7 +25,7 @@
 
             <TextView
                 android:id="@+id/loginAccountCreatedSubtitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -33,7 +33,7 @@
                 tools:text="@string/login_account_created_subtitle" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -41,7 +41,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -67,7 +67,7 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedMemberName"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -84,7 +84,7 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedTime"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -96,7 +96,7 @@
                     tools:text="@tools:sample/date/hhmm" />
 
                 <TextView
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/login_account_created_message"
@@ -108,7 +108,7 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -122,7 +122,7 @@
 
                 <Button
                     android:id="@+id/loginAccountCreatedLater"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -130,7 +130,7 @@
 
                 <Button
                     android:id="@+id/loginAccountCreatedDone"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index fed793cc8c..49504f1ada 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -22,7 +22,7 @@
 
         <TextView
             android:id="@+id/loginCaptchaNotice"
-            style="@style/VectorTextAppearanceCaption"
+            style="@style/TextAppearance.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index d2ffd1932e..1dfda244f1 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="?vctr_content_primary"
@@ -25,7 +25,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -70,7 +70,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -80,7 +80,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
index 6011c41845..c5d49a520c 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -37,7 +37,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormMandatoryNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="26dp"
@@ -49,7 +49,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -82,7 +82,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -92,7 +92,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormLater"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -103,7 +103,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index bcace7017e..c71909476f 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="?vctr_content_primary"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -89,7 +89,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
index d6ef48caf3..bb4d39dab8 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -51,7 +51,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -60,7 +60,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -109,7 +109,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
index aa4e9d3ab7..93be6d489c 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_mail_confirmation_title"
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -30,7 +30,7 @@
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -39,7 +39,7 @@
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
index fb1c992db0..0d33880a18 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -23,7 +23,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -31,7 +31,7 @@
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -40,7 +40,7 @@
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success.xml b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
index 3d78f3fb81..2fc0d08d21 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_success_title"
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -30,7 +30,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -39,7 +39,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
index 41941654f2..f07db563d6 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -23,7 +23,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -31,7 +31,7 @@
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -40,7 +40,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 8407df7e1c..ce4a968e4e 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -19,7 +19,7 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
@@ -32,7 +32,7 @@
 
             <TextView
                 android:id="@+id/loginServerText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -73,7 +73,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -116,7 +116,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
@@ -130,7 +130,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsLearnMore"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
@@ -158,7 +158,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
@@ -171,7 +171,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
@@ -187,7 +187,7 @@
 
             <Button
                 android:id="@+id/loginServerIKnowMyIdSubmit"
-                style="@style/Style.Vector.Login.Button.Text"
+                style="@style/Button.Vector.Style.Login.Text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index c84ad5ea2f..5842e2fe2f 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginServerText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -61,7 +61,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -77,7 +77,7 @@
 
             <TextView
                 android:id="@+id/loginServerText2"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
@@ -98,7 +98,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
@@ -111,7 +111,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
@@ -127,7 +127,7 @@
 
             <TextView
                 android:id="@+id/loginServerChoiceEmsLearnMore"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index d798741e66..cac3fe9ee0 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -27,7 +27,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -46,7 +46,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormLearnMore"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -75,7 +75,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -86,7 +86,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
@@ -96,7 +96,7 @@
 
             <Button
                 android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
index e99ec4223a..0b4f50faf0 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -46,7 +46,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -60,7 +60,7 @@
 
             <Button
                 android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
index 73846d47cf..15d50c8d4c 100644
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/loginWelcomeBack"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -43,7 +43,7 @@
 
             <TextView
                 android:id="@+id/loginWelcomeBackWarning"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -98,7 +98,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -108,7 +108,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
index c0fc136b17..c96c149e4a 100644
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -87,7 +87,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -97,7 +97,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -119,7 +119,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
index 83adbbf34b..ac6408b439 100644
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginSubtitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -52,7 +52,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -61,7 +61,7 @@
 
             <TextView
                 android:id="@+id/loginServerText3"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -71,7 +71,7 @@
 
             <Button
                 android:id="@+id/loginChooseAServer"
-                style="@style/Style.Vector.Login.Button.Text"
+                style="@style/Button.Vector.Style.Login.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
index 8f863a088f..407c1e6682 100644
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -33,7 +33,7 @@
 
             <TextView
                 android:id="@+id/loginMatrixIdentifier"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -41,7 +41,7 @@
                 tools:text="\@user:domain.org" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -50,7 +50,7 @@
                 android:textStyle="italic" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -99,7 +99,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index 0ff3016514..0521242468 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -33,7 +33,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -45,7 +45,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -59,7 +59,7 @@
             <!-- Sign up or sign in SSO -->
             <Button
                 android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="38dp"
@@ -71,7 +71,7 @@
             <!-- Sign in or gone -->
             <Button
                 android:id="@+id/loginSignupSigninSignIn"
-                style="@style/Style.Vector.Login.Button.Outlined"
+                style="@style/Button.Vector.Style.Login.Outlined"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="14dp"
@@ -99,7 +99,7 @@
 
                 <TextView
                     android:id="@+id/loginSignupSigninSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="27dp"
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
index 2996647522..770693c075 100644
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginSubtitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -52,7 +52,7 @@
 
             <TextView
                 android:id="@+id/loginChooseHelp"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/login_please_choose_a_user_name_help_2"
@@ -61,7 +61,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -82,7 +82,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 545bb5522f..de39fa3f4c 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -105,7 +105,7 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -130,7 +130,7 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -155,7 +155,7 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -179,7 +179,7 @@
 
     <Button
         android:id="@+id/loginSplashSubmit"
-        style="@style/Style.Vector.Login.Button"
+        style="@style/Button.Vector.Style.Login"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/login_splash_submit"
@@ -199,7 +199,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
index 190044fcdf..75d4663336 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -105,7 +105,7 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -130,7 +130,7 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -155,7 +155,7 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -189,7 +189,7 @@
 
         <Button
             android:id="@+id/loginSignupSigninSignUp"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -197,7 +197,7 @@
 
         <Button
             android:id="@+id/loginSignupSigninSignIn"
-            style="@style/Style.Vector.Login.Button.Text"
+            style="@style/Button.Vector.Style.Login.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -216,7 +216,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
index 694c17afd6..18a6ad618e 100644
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
@@ -15,7 +15,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -25,7 +25,7 @@
 
             <Button
                 android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index b295719e09..a00e48d413 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -20,7 +20,7 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/VectorTextAppearanceTitle"
+            style="@style/TextAppearance.Vector.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/VectorTextAppearanceBody"
+            style="@style/TextAppearance.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -54,7 +54,7 @@
 
         <Button
             android:id="@+id/loginTermsSubmit"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_marginEnd="36dp"
             android:text="@string/accept"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index 051a4f18bf..b6c8f4764a 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="36dp"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/VectorTextAppearanceBody"
+            style="@style/TextAppearance.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -58,7 +58,7 @@
 
         <Button
             android:id="@+id/loginTermsSubmit"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_marginEnd="36dp"
             android:text="@string/accept"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email.xml b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
index a68182bdcb..8fa747ff51 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_wait_for_email_title"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index 874423fb01..f227a1f312 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -15,7 +15,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailHelp"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -43,7 +43,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <ProgressBar
-                style="@style/VectorHorizontalProgressBar"
+                style="@style/ProgressBar.Vector.Horizontal"
                 android:layout_width="240dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 80c9ea1620..8345c58acb 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -71,7 +71,7 @@
 
                     <TextView
                         android:id="@+id/matrixProfileToolbarTitleView"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index fa6c4c208c..43a25b05a1 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -42,7 +42,7 @@
 
         <TextView
             android:id="@+id/matrixToCardNameText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -56,7 +56,7 @@
 
         <TextView
             android:id="@+id/matrixToCardAliasText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -87,7 +87,7 @@
 
         <TextView
             android:id="@+id/matrixToAccessText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -133,7 +133,7 @@
 
             <TextView
                 android:id="@+id/spaceChildMemberCountText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -144,7 +144,7 @@
 
         <TextView
             android:id="@+id/matrixToCardDescText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -214,7 +214,7 @@
         <!-- layout_goneMarginStart: add half the width of the avatar: 15dp -->
         <TextView
             android:id="@+id/peopleYouMayKnowText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -254,7 +254,7 @@
 
         <!--        <Button-->
         <!--            android:id="@+id/matrixToCardSecondaryButton"-->
-        <!--            style="@style/VectorButtonStyleOutlined"-->
+        <!--            style="@style/Button.Vector.Style.Outlined"-->
         <!--            android:layout_width="0dp"-->
         <!--            android:layout_height="wrap_content"-->
         <!--            android:layout_marginTop="8dp"-->
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 4c98f26ec3..b99cfb1172 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/matrixToCardNameText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/matrixToCardUserIdText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 94a5b84d78..b81a962b93 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -36,7 +36,7 @@
 
         <Button
             android:id="@+id/publicRoomsCreateNewRoom"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index 0eb6ef1775..1aeb61e9bf 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/reAuthConfirmText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -70,7 +70,7 @@
         <!--            android:layout_height="wrap_content"-->
         <!--            android:gravity="start"-->
         <!--            android:text="@string/login_signin_matrix_id_password_notice"-->
-        <!--            style="@style/VectorTextView.Caption"-->
+        <!--            style="@style/TextView.Vector.Caption"-->
         <!--            android:visibility="gone"-->
         <!--            app:layout_constraintEnd_toEndOf="parent"-->
         <!--            app:layout_constraintStart_toStartOf="parent"-->
@@ -79,7 +79,7 @@
 
         <TextView
             android:id="@+id/genericErrorText"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="start"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index 18af0a56ab..cabde658b6 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -37,7 +37,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -50,7 +50,7 @@
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_review_terms.xml b/vector/src/main/res/layout/fragment_review_terms.xml
index 2c7fa6c586..57d177d7b8 100644
--- a/vector/src/main/res/layout/fragment_review_terms.xml
+++ b/vector/src/main/res/layout/fragment_review_terms.xml
@@ -30,7 +30,7 @@
 
         <Button
             android:id="@+id/reviewTermsDecline"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 4af84c63ee..5d8b6c6cbb 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarTitleView"
-                    style="@style/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -63,7 +63,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarSubtitleView"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index d9a241f72e..9cba9a955f 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -60,7 +60,7 @@
 
             <ProgressBar
                 android:id="@+id/roomPreviewPeekingProgress"
-                style="@style/VectorHorizontalProgressBar"
+                style="@style/ProgressBar.Vector.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
@@ -90,7 +90,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewName"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="56dp"
@@ -101,7 +101,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewTopic"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -112,7 +112,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewLabel"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -122,7 +122,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewError"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 1ebf15edb4..7f3deaecd0 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/roomSettingsToolbarTitleView"
-                    style="@style/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index d32622b1de..f4939d0341 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomUploadsToolbarTitleView"
-                    style="@style/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_widget.xml b/vector/src/main/res/layout/fragment_room_widget.xml
index 196ebfaff4..94fb3bb992 100644
--- a/vector/src/main/res/layout/fragment_room_widget.xml
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -40,7 +40,7 @@
 
         <TextView
             android:id="@+id/widgetErrorText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_set_identity_server.xml b/vector/src/main/res/layout/fragment_set_identity_server.xml
index 596340431a..446b617771 100644
--- a/vector/src/main/res/layout/fragment_set_identity_server.xml
+++ b/vector/src/main/res/layout/fragment_set_identity_server.xml
@@ -14,7 +14,7 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultNotice"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -24,7 +24,7 @@
 
         <Button
             android:id="@+id/identityServerSetDefaultSubmit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultAlternative"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -64,7 +64,7 @@
 
         <Button
             android:id="@+id/identityServerSetDefaultAlternativeSubmit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
index cf09b14361..bf8324a821 100644
--- a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
+++ b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/troubleshoot_summ_title"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -42,7 +42,7 @@
 
         <TextView
             android:id="@+id/toubleshoot_summ_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index b85adce5aa..61af81f572 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -35,7 +35,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -76,7 +76,7 @@
 
         <Button
             android:id="@+id/createNewRoom"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index d4f63aec93..5bbb4d9bd0 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,7 +13,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -24,7 +24,7 @@
 
         <TextView
             android:id="@+id/accessInfoHelpText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 40a915d9e9..fc47dafae9 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -21,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -35,7 +35,7 @@
 
         <TextView
             android:id="@+id/joinInfoHelpText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
@@ -72,7 +72,7 @@
 
         <TextView
             android:id="@+id/changeLaterText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index de3e5537ff..d378558a1e 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -41,7 +41,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -62,7 +62,7 @@
 
             <ProgressBar
                 android:id="@+id/spacePreviewPeekingProgress"
-                style="@style/VectorHorizontalProgressBar"
+                style="@style/ProgressBar.Vector.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
@@ -101,7 +101,7 @@
 
             <Button
                 android:id="@+id/spacePreviewDeclineInviteButton"
-                style="@style/VectorButtonStyle.Destructive"
+                style="@style/Button.Vector.Style.Destructive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -110,7 +110,7 @@
 
             <Button
                 android:id="@+id/spacePreviewAcceptInviteButton"
-                style="@style/VectorButtonStyle.Positive"
+                style="@style/Button.Vector.Style.Positive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index eed347f82f..13efd49c40 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -81,7 +81,7 @@
 
         <Button
             android:id="@+id/ssss_key_use_file"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/use_file"
@@ -90,7 +90,7 @@
 
         <Button
             android:id="@+id/ssss_key_submit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/_continue"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index c05c709b76..7ea7b64c9a 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase_warning_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -88,7 +88,7 @@
 
         <Button
             android:id="@+id/ssss_passphrase_submit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
@@ -98,7 +98,7 @@
 
         <TextView
             android:id="@+id/ssss_passphrase_or"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -110,7 +110,7 @@
 
         <Button
             android:id="@+id/ssss_passphrase_use_key"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index b4ca7f05a9..5004bb17d3 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/reset_title"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_all_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_other_devices"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:layout_marginStart="16dp"
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_text3"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_text4"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -89,7 +89,7 @@
 
         <Button
             android:id="@+id/ssss_reset_button_cancel"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cancel"
@@ -97,7 +97,7 @@
 
         <Button
             android:id="@+id/ssss_reset_button_reset"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/reset"
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 0d8cb778eb..b09f3a3d2f 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/showUserCodeTitle"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -104,7 +104,7 @@
 
                 <TextView
                     android:id="@+id/showUserCodeCardNameText"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -118,7 +118,7 @@
 
                 <TextView
                     android:id="@+id/showUserCodeCardUserIdText"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -158,7 +158,7 @@
 
         <TextView
             android:id="@+id/showUserCodeInfoText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -189,7 +189,7 @@
 
         <Button
             android:id="@+id/showUserCodeScanButton"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 8ffd18c2fc..58630f9149 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/userDirectoryTitle"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index a9abc3eff6..3cc2dd2c35 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -38,7 +38,7 @@
 
                 <TextView
                     android:id="@+id/userListTitle"
-                    style="@style/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -111,7 +111,7 @@
 
     <TextView
         android:id="@+id/userListE2EbyDefaultDisabled"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index 892d86d670..81e8f6de85 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/section_header_textview"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index 6ca2f93561..d8500256ba 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/commandName"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/commandParameter"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/commandDescription"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/commandName"
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index 62c435e6e5..fb49eeb955 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/itemAutocompleteEmoji"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiName"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiSubname"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 1896ea8b7b..68fb680b22 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/matrixItemAutocompleteName"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/matrixItemAutocompleteSubname"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_autocomplete_more_result.xml b/vector/src/main/res/layout/item_autocomplete_more_result.xml
index 6f209c9c32..4b631065c5 100644
--- a/vector/src/main/res/layout/item_autocomplete_more_result.xml
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/VectorTextView.Caption"
+    style="@style/TextView.Vector.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 8f341f49a6..e396cefd91 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -53,7 +53,7 @@
 
         <TextView
             android:id="@+id/actionTitle"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index c83c36ed42..23a76e75ee 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_timestamp"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
@@ -67,7 +67,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -86,7 +86,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body_details"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index 4650eeee47..c692bda984 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/messageStatusText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index 339813f736..89db894631 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/quickReaction0"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/quickReaction1"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/quickReaction2"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/quickReaction3"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/quickReaction4"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/quickReaction5"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -63,7 +63,7 @@
 
     <TextView
         android:id="@+id/quickReaction6"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -72,7 +72,7 @@
 
     <TextView
         android:id="@+id/quickReaction7"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
index 69e8b1f076..bba469b056 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_radio.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/actionTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/actionDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index 36124c66e6..abeae9b8d1 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -27,7 +27,7 @@
 
     <TextView
         android:id="@+id/bottomSheetRoomPreviewName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index c3cdccd6b5..eed9407557 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleTitle"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index 0fe9d4b61a..858e0131b2 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -38,7 +38,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/breadcrumbsUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -56,7 +56,7 @@
 
     <TextView
         android:id="@+id/breadcrumbsTypingView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:background="@drawable/circle"
diff --git a/vector/src/main/res/layout/item_completion_homeserver.xml b/vector/src/main/res/layout/item_completion_homeserver.xml
index 5e4ec08217..f66608bf0f 100644
--- a/vector/src/main/res/layout/item_completion_homeserver.xml
+++ b/vector/src/main/res/layout/item_completion_homeserver.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index fadb00bfb2..f1266e9892 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/actionTitleText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 7b8ffd2312..954c20afc3 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/contactDetailName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/contactDetailMatrixId"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 0663b2ed7d..c6563e71d2 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/contactDisplayName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 20a2690b5c..6cfdbcd493 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -59,7 +59,7 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserID"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 39c1f04aa7..5bbb21241e 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -18,7 +18,7 @@
         <!-- In compact mode only this is shown-->
         <TextView
             android:id="@+id/itemDeviceSimpleSummary"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
@@ -31,7 +31,7 @@
         -->
         <TextView
             android:id="@+id/itemDeviceDisplayNameLabel"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -40,7 +40,7 @@
 
         <TextView
             android:id="@+id/itemDeviceDisplayName"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/itemDeviceIdLabel"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -57,7 +57,7 @@
 
         <TextView
             android:id="@+id/itemDeviceId"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
@@ -67,7 +67,7 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeenLabel"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeen"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index 82b43776a2..2425980fec 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -13,7 +13,7 @@
 
     <TextView
         android:id="@+id/item_emoji_tv"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -29,7 +29,7 @@
 
         <TextView
             android:id="@+id/item_emoji_name"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/item_emoji_keyword"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="2"
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index ef46639041..b0c213b1a1 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -10,7 +10,7 @@
     <!-- size in dp, because we do not want the display to be impacted by font size setting -->
     <TextView
         android:id="@+id/item_emoji_tv"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/item_emoji_name_tv"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_error_retry.xml b/vector/src/main/res/layout/item_error_retry.xml
index ec03a13530..d104712163 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemErrorRetryText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?colorError"
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 1f474baeb7..18f3260fdd 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -9,7 +9,7 @@
 
     <im.vector.app.core.ui.views.NonScrollingTextView
         android:id="@+id/expandableContent"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:autoLink="web"
diff --git a/vector/src/main/res/layout/item_form_advanced_toggle.xml b/vector/src/main/res/layout/item_form_advanced_toggle.xml
index da6b21a60d..47f1917e9f 100644
--- a/vector/src/main/res/layout/item_form_advanced_toggle.xml
+++ b/vector/src/main/res/layout/item_form_advanced_toggle.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/itemFormAdvancedToggleTitleView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 30d2b15c22..1823d21c46 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/formSwitchTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/formSwitchSummary"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_generic_button.xml b/vector/src/main/res/layout/item_generic_button.xml
index 75d1e7a624..d4139bfa0c 100644
--- a/vector/src/main/res/layout/item_generic_button.xml
+++ b/vector/src/main/res/layout/item_generic_button.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/itemGenericItemButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAllCaps="false"
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index 6e2c0fa8f2..a23f1953d6 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/emptyItemTitleView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/emptyItemMessageView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_generic_footer.xml b/vector/src/main/res/layout/item_generic_footer.xml
index 3f4d09a26c..209c18b7bf 100644
--- a/vector/src/main/res/layout/item_generic_footer.xml
+++ b/vector/src/main/res/layout/item_generic_footer.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/itemGenericFooterText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 2e5e7fc5d5..4f5655fd85 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemGenericHeaderText"
-    style="@style/VectorTextView.Subtitle"
+    style="@style/TextView.Vector.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index b436b2d64c..edef6b0696 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/item_generic_title_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/item_generic_description_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -115,7 +115,7 @@
 
     <Button
         android:id="@+id/item_generic_destructive_action_button"
-        style="@style/VectorButtonStyle.Destructive"
+        style="@style/Button.Vector.Style.Destructive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_generic_pill_footer.xml b/vector/src/main/res/layout/item_generic_pill_footer.xml
index 06d09eed23..1f7f54b572 100644
--- a/vector/src/main/res/layout/item_generic_pill_footer.xml
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -20,7 +20,7 @@
 
     <TextView
         android:id="@+id/itemGenericPillText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index da0e12cbfb..7304fee85f 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/itemGenericWithValueLabelText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/itemGenericWithValueValueText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 2586fd4e6e..605a352de4 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index a3c9666609..fd7474d93f 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemHelpText"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
diff --git a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
index 3b7c528cbf..cece6e34ca 100644
--- a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
+++ b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
@@ -18,7 +18,7 @@
 
     <Button
         android:id="@+id/keys_backup_settings_footer_button2"
-        style="@style/VectorButtonStyle"
+        style="@style/Button.Vector.Style"
         android:layout_width="@dimen/button_max_width"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 9fdc5d6c1b..99c9bf25f1 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/knownUserName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -58,7 +58,7 @@
 
     <TextView
         android:id="@+id/knownUserID"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/item_loading.xml b/vector/src/main/res/layout/item_loading.xml
index 03c0d81491..c23965f831 100644
--- a/vector/src/main/res/layout/item_loading.xml
+++ b/vector/src/main/res/layout/item_loading.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/loadingText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index dabca844fc..a8bfceca3b 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/localeTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/localeSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_login_centered_button.xml b/vector/src/main/res/layout/item_login_centered_button.xml
index 07f4c379d4..d13242070d 100644
--- a/vector/src/main/res/layout/item_login_centered_button.xml
+++ b/vector/src/main/res/layout/item_login_centered_button.xml
@@ -6,7 +6,7 @@
 
     <Button
         android:id="@+id/itemLoginCenteredButton"
-        style="@style/Style.Vector.Login.Button"
+        style="@style/Button.Vector.Style.Login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_error_retry.xml b/vector/src/main/res/layout/item_login_error_retry.xml
index 88ad676e3c..4465b5320d 100644
--- a/vector/src/main/res/layout/item_login_error_retry.xml
+++ b/vector/src/main/res/layout/item_login_error_retry.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/itemLoginErrorRetryText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index b07687f3a4..b94c40abd4 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -53,7 +53,7 @@
 
         <Button
             android:id="@+id/itemLoginPasswordFormForgetPasswordButton"
-            style="@style/Style.Vector.Login.Button.Text"
+            style="@style/Button.Vector.Style.Login.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
@@ -63,7 +63,7 @@
 
         <Button
             android:id="@+id/itemLoginPasswordFormSubmit"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/item_login_red_button.xml b/vector/src/main/res/layout/item_login_red_button.xml
index 4a290fa328..b7468d1d22 100644
--- a/vector/src/main/res/layout/item_login_red_button.xml
+++ b/vector/src/main/res/layout/item_login_red_button.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/itemLoginRedButton"
-        style="@style/Style.Vector.Login.Button"
+        style="@style/Button.Vector.Style.Login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_login_text.xml b/vector/src/main/res/layout/item_login_text.xml
index 8d0fd994f6..5b30612923 100644
--- a/vector/src/main/res/layout/item_login_text.xml
+++ b/vector/src/main/res/layout/item_login_text.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginText"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index a77199b7af..5af6bb4896 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_title.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginTitleText"
-    style="@style/VectorTextView.Title"
+    style="@style/TextView.Vector.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index 23b6d92461..3009e5720c 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginTitleSmallText"
-    style="@style/VectorTextView.Subtitle"
+    style="@style/TextView.Vector.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_no_result.xml b/vector/src/main/res/layout/item_no_result.xml
index 5259719e55..aefdef7a5a 100644
--- a/vector/src/main/res/layout/item_no_result.xml
+++ b/vector/src/main/res/layout/item_no_result.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/itemNoResultText"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index a69eaff0f9..4d6336812f 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/troubleshootTestTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/troubleshootTestDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index 52baf61315..c2edadfbb9 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_title"
-        style="@style/VectorTextAppearanceBody"
+        style="@style/TextAppearance.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_subtitle"
-        style="@style/VectorTextAppearanceCaption"
+        style="@style/TextAppearance.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_positive_button.xml b/vector/src/main/res/layout/item_positive_button.xml
index 11fb30599f..c15e4900ee 100644
--- a/vector/src/main/res/layout/item_positive_button.xml
+++ b/vector/src/main/res/layout/item_positive_button.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/itemGenericItemButton"
-        style="@style/VectorButtonStyle.Positive"
+        style="@style/Button.Vector.Style.Positive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 4977c08a60..ca87e69dad 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/actionTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -50,7 +50,7 @@
 
     <TextView
         android:id="@+id/actionSubtitle"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 59d0ac3dc4..7c68afe454 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -73,7 +73,7 @@
 
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index e44a399208..b187dbd50b 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml
index c7011eef26..ba6d40b79e 100644
--- a/vector/src/main/res/layout/item_profile_section.xml
+++ b/vector/src/main/res/layout/item_profile_section.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemProfileSectionView"
-    style="@style/VectorTextView.Title"
+    style="@style/TextView.Vector.Title"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="?vctr_list_separator_system"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 1364cf77cb..30f3f99316 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomTopic"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomMembersCount"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -80,7 +80,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomAlias"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index a69107c86c..cc80dc8f0b 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKind"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppId"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppIdValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKey"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKeyValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -56,7 +56,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -66,7 +66,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppNameValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -85,7 +85,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceNameValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -95,7 +95,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURL"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -104,7 +104,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURLValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -113,7 +113,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormat"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -123,7 +123,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormatValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index 55ba8756e1..b019f1913b 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -16,7 +16,7 @@
 
         <TextView
             android:id="@+id/pushRuleId"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/pushRuleDescription"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index e590faaae1..f2d078684c 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -97,7 +97,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -135,7 +135,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -156,7 +156,7 @@
 
     <TextView
         android:id="@+id/roomLastEventTimeView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -168,7 +168,7 @@
 
     <TextView
         android:id="@+id/roomLastEventView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
@@ -183,7 +183,7 @@
 
     <TextView
         android:id="@+id/roomTypingView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/item_room_alias_text_input.xml b/vector/src/main/res/layout/item_room_alias_text_input.xml
index 909d29d44d..d7f5ac2164 100644
--- a/vector/src/main/res/layout/item_room_alias_text_input.xml
+++ b/vector/src/main/res/layout/item_room_alias_text_input.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHash"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHomeServer"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index a87bdd3e9c..f4d2b47881 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/roomCategoryTitleView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -33,7 +33,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index e8633d7ea7..12a24dc816 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -27,7 +27,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index 1969f6473a..c0b3c72586 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index 352b0e121a..86b355e0e8 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical">
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -16,7 +16,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterCreateRoom"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -25,7 +25,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterCreateDirect"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -33,7 +33,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterOpenRoomDirectory"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 69910d2b75..f2a6d653c3 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -32,7 +32,7 @@
 
     <TextView
         android:id="@+id/roomInvitationNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 3482080a07..f2025fee4a 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index 44b1f3e7b9..484b321a35 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/itemManageRoomSuggested"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 2e941ca6cb..db31e5f2f6 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/messageTimeView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
@@ -50,7 +50,7 @@
 
     <TextView
         android:id="@+id/messageContentView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_settings_button.xml b/vector/src/main/res/layout/item_settings_button.xml
index dedf04438c..fc3ffe4588 100644
--- a/vector/src/main/res/layout/item_settings_button.xml
+++ b/vector/src/main/res/layout/item_settings_button.xml
@@ -8,7 +8,7 @@
 
     <Button
         android:id="@+id/settings_item_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index 8920577431..d1722cc375 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -13,7 +13,7 @@
 
     <TextView
         android:id="@+id/settings_item_text"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -29,7 +29,7 @@
 
     <Button
         android:id="@+id/settings_item_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_settings_continue_cancel.xml b/vector/src/main/res/layout/item_settings_continue_cancel.xml
index 8f7dadf4a2..6ad8f366b2 100644
--- a/vector/src/main/res/layout/item_settings_continue_cancel.xml
+++ b/vector/src/main/res/layout/item_settings_continue_cancel.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/settings_item_cancel_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/cancel"
@@ -19,7 +19,7 @@
 
     <Button
         android:id="@+id/settings_item_continue_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/_continue"
diff --git a/vector/src/main/res/layout/item_settings_edit_text.xml b/vector/src/main/res/layout/item_settings_edit_text.xml
index 4407e136a2..d240b6e072 100644
--- a/vector/src/main/res/layout/item_settings_edit_text.xml
+++ b/vector/src/main/res/layout/item_settings_edit_text.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/settings_item_edit_text_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
diff --git a/vector/src/main/res/layout/item_settings_helper_info.xml b/vector/src/main/res/layout/item_settings_helper_info.xml
index 489f7a44bd..9a73dca344 100644
--- a/vector/src/main/res/layout/item_settings_helper_info.xml
+++ b/vector/src/main/res/layout/item_settings_helper_info.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_helper_text"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_settings_information.xml b/vector/src/main/res/layout/item_settings_information.xml
index 0d91ba3d12..3578990e98 100644
--- a/vector/src/main/res/layout/item_settings_information.xml
+++ b/vector/src/main/res/layout/item_settings_information.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/settings_item_information"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
diff --git a/vector/src/main/res/layout/item_settings_section_title.xml b/vector/src/main/res/layout/item_settings_section_title.xml
index 15c6afe70d..369977f6ab 100644
--- a/vector/src/main/res/layout/item_settings_section_title.xml
+++ b/vector/src/main/res/layout/item_settings_section_title.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_section_title_text"
-    style="@style/VectorTextView.HeadlineM"
+    style="@style/TextView.Vector.HeadlineM"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?vctr_header_background"
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index 175dfb63b9..64d2af5004 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -18,7 +18,7 @@
 
         <TextView
             android:id="@+id/settings_item_title"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
@@ -28,7 +28,7 @@
 
         <TextView
             android:id="@+id/settings_item_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 13feeabcb3..581a0bdcc6 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/item_settings_three_pid_title"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 92d45ee02e..8d241ec46c 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoKey"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 33d869e678..4b04d9588d 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -35,7 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -57,7 +57,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/groupDescView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index 788590287d..445b28e8d4 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 551d6377c3..546a5c2b9c 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -9,7 +9,7 @@
     android:paddingEnd="16dp">
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -19,7 +19,7 @@
         app:drawableEndCompat="@drawable/ic_beta_pill" />
 
     <TextView
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/spaceBetaFeedbackAction"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index bed015c4ca..5921b0c307 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/childRoomName"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -61,7 +61,7 @@
 
         <TextView
             android:id="@+id/childRoomTopic"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
@@ -87,7 +87,7 @@
 
         <TextView
             android:id="@+id/spaceChildMemberCountText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index df7ff6164c..e93c87dcc3 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -46,7 +46,7 @@
 
     <TextView
         android:id="@+id/childSpaceName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 33f344f7cf..94c11c5403 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/spaceSummaryMemberCountText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/spaceSummaryTopic"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 7a8211cb94..b15a6b6fd4 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -35,7 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -57,7 +57,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index abd0cc8705..9ecbc56239 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -59,7 +59,7 @@
 
     <TextView
         android:id="@+id/suggestedRoomDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/joinSuggestedRoomButton"
-        style="@style/VectorButtonStyleOutlined"
+        style="@style/Button.Vector.Style.Outlined"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 2f7bf6120a..704f387062 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@+id/messageTimeView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 9d4e738823..d5662303dc 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/itemCallCreatorNameTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/itemCallKindTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/itemCallStatusTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -64,7 +64,7 @@
 
         <Button
             android:id="@+id/itemCallAcceptView"
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
@@ -77,7 +77,7 @@
 
         <Button
             android:id="@+id/itemCallRejectView"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
index 4c09b7b9ca..73f0ae45af 100644
--- a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
@@ -10,7 +10,7 @@
 
         <TextView
             android:id="@+id/codeBlockTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="monospace" />
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/codeBlockEditedView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp" />
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index 74cccd746e..c45149c818 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/roomCreateItemDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 352634041c..29fc757fe2 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -15,7 +15,7 @@
 
     <TextView
         android:id="@+id/itemDayTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index cc7f37179c..38d2cc672b 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -17,7 +17,7 @@
 
     <TextView
         android:id="@+id/itemDefaultTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index caa5b7e202..e2ef700b36 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -41,7 +41,7 @@
     <!-- the media -->
     <TextView
         android:id="@+id/messageFilenameView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index fdbf44d6ad..93347c9de1 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/itemMergedSummaryTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 6d5046f857..bfcad9ebad 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/roomNameTileText"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -77,7 +77,7 @@
 
         <TextView
             android:id="@+id/roomNameDescriptionText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -90,7 +90,7 @@
 
         <TextView
             android:id="@+id/roomNameTopicText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -126,7 +126,7 @@
                 android:src="@drawable/ic_add_people" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -156,7 +156,7 @@
 
         <TextView
             android:id="@+id/itemNoticeTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -173,7 +173,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index d9cd8b47a5..3b4fa2d6b8 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneTitleTextView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneDetailTextView"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index c19260e3b4..54ab7141be 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -17,7 +17,7 @@
 
     <TextView
         android:id="@+id/itemNoticeTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index 49c47e87fb..251f77323a 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/optionLabelText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
@@ -23,7 +23,7 @@
         <!-- Filled at runtime with buttons -->
         <!--Button
             android:id="@+id/pollButton1"
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Button.Vector.Style.Outlined.Poll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Create Github issue" /-->
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index 3ef5dc969b..cd9decaceb 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -23,7 +23,7 @@
 
         <TextView
             android:id="@+id/pollLabelText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -36,7 +36,7 @@
 
     <Button
         android:id="@+id/pollButton1"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -45,7 +45,7 @@
 
     <Button
         android:id="@+id/pollButton2"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -54,7 +54,7 @@
 
     <Button
         android:id="@+id/pollButton3"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -63,7 +63,7 @@
 
     <Button
         android:id="@+id/pollButton4"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -72,7 +72,7 @@
 
     <Button
         android:id="@+id/pollButton5"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -134,7 +134,7 @@
 
     <TextView
         android:id="@+id/pollInfosText"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index 63521dd78b..30ace00ae0 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -1,6 +1,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:drawablePadding="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index 7c2ac4d39a..9da2491595 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneTitleTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneDetailTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 5713d9dc30..1dcb2bf982 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/messageTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 8af7b6f3ce..05ab145134 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemVerificationTitleTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDetailTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -44,7 +44,7 @@
 
         <Button
             android:id="@+id/sas_verification_verified_decline_button"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -52,7 +52,7 @@
 
         <Button
             android:id="@+id/sas_verification_verified_accept_button"
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/accept" />
@@ -61,7 +61,7 @@
 
     <TextView
         android:id="@+id/itemVerificationStatusText"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 780856a5cd..e2100aa4db 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemWidgetTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="6dp"
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index c6272d8d9d..a607e60b5d 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -13,7 +13,7 @@
         android:background="@color/notification_accent_color" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index 024cded8ae..efbe37d525 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/term_name"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/term_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index c326ee8ac2..7365fabdd9 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemUnknownRoomName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index 3d525407a5..9877cf194b 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/uploadsFileTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -39,7 +39,7 @@
 
     <TextView
         android:id="@+id/uploadsFileSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 7d6c151462..d5162a21e7 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemUserId"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/itemUserName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index bd7c838015..754f370315 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userDirectoryLetterView"
-    style="@style/VectorTextView.HeadlineM"
+    style="@style/TextView.Vector.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index 4b9f7ca9b9..6360412657 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userListHeaderView"
-    style="@style/VectorTextView.HeadlineM"
+    style="@style/TextView.Vector.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index efdd90f68d..ef6a66554f 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/itemVerificationActionTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -49,7 +49,7 @@
 
     <TextView
         android:id="@+id/itemVerificationActionSubTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_verification_decimal_code.xml b/vector/src/main/res/layout/item_verification_decimal_code.xml
index 0ba114c64b..2f7632ca05 100644
--- a/vector/src/main/res/layout/item_verification_decimal_code.xml
+++ b/vector/src/main/res/layout/item_verification_decimal_code.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationDecimalCode"
-    style="@style/VectorTextView.Title"
+    style="@style/TextView.Vector.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index 5d3c8ef4fc..5205c418a3 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationNoticeText"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index d7b41967a2..a1cb32a353 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/use_latest_riot"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="start"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/app_desktop_web"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -67,7 +67,7 @@
 
     <TextView
         android:id="@+id/app_ios_android"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -87,7 +87,7 @@
 
 
     <TextView
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index 6ef3f813ee..b9a3945596 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemVerificationWaitingTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/media_upload_download_progress_layout.xml b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
index f5fdc14c8e..8e6db4570e 100644
--- a/vector/src/main/res/layout/media_upload_download_progress_layout.xml
+++ b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/mediaProgressTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index b4cf120b8a..949fdb28c7 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/overlayCounterText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/overlayInfoText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index ffb98e5374..5025e2f62e 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -43,7 +43,7 @@
 
                 <TextView
                     android:id="@+id/waitingStatusText"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/option_buttons.xml b/vector/src/main/res/layout/option_buttons.xml
index 6ea394725b..ae49294f2f 100644
--- a/vector/src/main/res/layout/option_buttons.xml
+++ b/vector/src/main/res/layout/option_buttons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/VectorButtonStyleUnelevated.Bot"
+    style="@style/Button.Vector.Style.Unelevated.Bot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:text="Create Github issue" />
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index fbeb0b0ea4..1336de1bb5 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/reactionText"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
         android:layout_marginStart="6dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/reactionCount"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index f5f9703081..d6a3e5ea7a 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -7,7 +7,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/actionUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index e3144d0d25..c27bf9eaa8 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/inviteNameView"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/inviteIdentifierView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -49,7 +49,7 @@
 
     <TextView
         android:id="@+id/inviteLabelView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index 3328b40885..c05c1a8da1 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -19,7 +19,7 @@
 
         <TextView
             android:id="@android:id/title"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@android:id/summary"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index 4cec603b87..b4f96b9115 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/activeConferenceInfo"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/deleteWidgetButton"
@@ -27,7 +27,7 @@
 
     <Button
         android:id="@+id/deleteWidgetButton"
-        style="@style/VectorButtonStyleText.OnPrimary"
+        style="@style/Button.Vector.Style.Text.OnPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/activeConferenceInfo"
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index e6f76a71b3..f8bc436196 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/bottomSheetActionTitle"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -54,7 +54,7 @@
 
         <TextView
             android:id="@+id/bottomSheetActionSubTitle"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/view_button_state.xml b/vector/src/main/res/layout/view_button_state.xml
index b6ee7864c9..41a08cbc73 100644
--- a/vector/src/main/res/layout/view_button_state.xml
+++ b/vector/src/main/res/layout/view_button_state.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/buttonStateButtonFlat"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -46,7 +46,7 @@
 
     <Button
         android:id="@+id/buttonStateRetry"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml
index e3389ddb63..d893b621f5 100644
--- a/vector/src/main/res/layout/view_current_calls.xml
+++ b/vector/src/main/res/layout/view_current_calls.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/currentCallsInfo"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/returnToCallButton"
@@ -27,7 +27,7 @@
 
     <Button
         android:id="@+id/returnToCallButton"
-        style="@style/VectorButtonStyleText.OnPrimary"
+        style="@style/Button.Vector.Style.Text.OnPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/currentCallsInfo"
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index bc66a11dfc..b5bf43c027 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -20,7 +20,7 @@
 
     <TextView
         android:id="@+id/failedMessagesWarningTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -49,7 +49,7 @@
 
     <Button
         android:id="@+id/failedMessagesRetryButton"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/view_file_icon.xml b/vector/src/main/res/layout/view_file_icon.xml
index 2d1331a83a..b3989963ac 100644
--- a/vector/src/main/res/layout/view_file_icon.xml
+++ b/vector/src/main/res/layout/view_file_icon.xml
@@ -8,7 +8,7 @@
 
     <ProgressBar
         android:id="@+id/messageFileProgressbar"
-        style="@style/FileProgressBar"
+        style="@style/ProgressBar.Vector.File"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:progress="40" />
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 9cf29dcbfb..7785612127 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/jumpToReadMarkerLabelView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@+id/closeJumpToReadMarkerView"
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index a6ee178152..f26625888b 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_1"
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
@@ -44,7 +44,7 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_2"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
diff --git a/vector/src/main/res/layout/view_notification_area.xml b/vector/src/main/res/layout/view_notification_area.xml
index 7a82dd3381..adc2dad32b 100644
--- a/vector/src/main/res/layout/view_notification_area.xml
+++ b/vector/src/main/res/layout/view_notification_area.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/roomNotificationMessage"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
index 7cd1de858b..856a32c9ca 100644
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ b/vector/src/main/res/layout/view_poll_result_line.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/pollResultItemLabel"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -32,7 +32,7 @@
 
     <TextView
         android:id="@+id/pollResultItemPercent"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index 9ca38acf59..a6be054289 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/receiptMore"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index ae17a62ab5..c88f667ad1 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/receiptMore"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/item_event_message_state_size"
         android:background="@drawable/pill_receipt"
diff --git a/vector/src/main/res/layout/view_room_widgets_banner.xml b/vector/src/main/res/layout/view_room_widgets_banner.xml
index dbc59dcc9b..0babfbdab8 100644
--- a/vector/src/main/res/layout/view_room_widgets_banner.xml
+++ b/vector/src/main/res/layout/view_room_widgets_banner.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsLabel"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsViewAction"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
index 4543cfcb46..a4da54f04f 100644
--- a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/actionTitleText"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index 1109860c82..31534cf124 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/subTitle"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 008372b4c5..b2d0f8a5f4 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/errorMessageView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -75,7 +75,7 @@
 
         <TextView
             android:id="@+id/emptyTitleView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -91,7 +91,7 @@
 
         <TextView
             android:id="@+id/emptyMessageView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="220dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 6aac00a12d..e34466ccf8 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/memberProfileNameView"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -54,7 +54,7 @@
 
         <TextView
             android:id="@+id/memberProfileIdView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -69,7 +69,7 @@
 
         <TextView
             android:id="@+id/memberProfilePowerLevelView"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -83,7 +83,7 @@
 
         <TextView
             android:id="@+id/memberProfileStatusView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 43b6084666..3c4bd7ce80 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/roomProfileNameView"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -44,7 +44,7 @@
 
     <TextView
         android:id="@+id/roomProfileAliasView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/view_sync_state.xml b/vector/src/main/res/layout/view_sync_state.xml
index 8ae4f4235b..6167a9e4ab 100644
--- a/vector/src/main/res/layout/view_sync_state.xml
+++ b/vector/src/main/res/layout/view_sync_state.xml
@@ -16,7 +16,7 @@
         tools:visibility="visible">
 
         <ProgressBar
-            style="@style/VectorHorizontalProgressBar"
+            style="@style/ProgressBar.Vector.Horizontal"
             android:layout_width="match_parent"
             android:layout_height="14dp"
             android:layout_gravity="center"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/syncStateNoNetwork"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorError"
@@ -47,7 +47,7 @@
         tools:visibility="visible">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml
index 186d54f799..218b36df96 100644
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/url_preview_title"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/url_preview_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
@@ -60,7 +60,7 @@
 
     <TextView
         android:id="@+id/url_preview_site"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"

From 4178f3922683162e1ee2dbaa196562bd6285936d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Jun 2021 23:40:15 +0200
Subject: [PATCH 36/49] Restore all caps false

---
 vector/src/main/res/layout/fragment_home_drawer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 12c2fc4ef8..9e9410d3d7 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -88,6 +88,7 @@
             android:insetBottom="0dp"
             android:padding="0dp"
             android:text="@string/invite_friends"
+            android:textAllCaps="false"
             app:icon="@drawable/ic_share"
             app:iconGravity="textStart"
             app:iconSize="20dp"

From 5e9b4e77bfe259af39ac31e81aa11a932e6c09da Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 09:02:03 +0200
Subject: [PATCH 37/49] Rename a last time some style: M -> Medium

---
 .../debug/res/layout/activity_debug_text_view.xml  | 14 +++++++-------
 .../src/main/res/values/styles_text_view.xml       | 14 +++++++-------
 .../src/main/res/values/text_appearances.xml       |  6 +++---
 .../src/main/res/layout/bottom_sheet_bootstrap.xml |  2 +-
 .../main/res/layout/bottom_sheet_call_dial_pad.xml |  2 +-
 .../res/layout/bottom_sheet_logout_and_backup.xml  |  2 +-
 .../layout/bottom_sheet_room_widget_permission.xml |  2 +-
 .../res/layout/bottom_sheet_save_recovery_key.xml  |  2 +-
 .../main/res/layout/bottom_sheet_verification.xml  |  2 +-
 .../res/layout/dialog_recovery_key_saved_info.xml  |  2 +-
 .../src/main/res/layout/fragment_contacts_book.xml |  2 +-
 ...fragment_create_direct_room_directory_users.xml |  2 +-
 .../src/main/res/layout/fragment_create_room.xml   |  2 +-
 .../src/main/res/layout/fragment_home_detail.xml   |  2 +-
 .../fragment_keys_backup_restore_success.xml       |  2 +-
 .../layout/fragment_keys_backup_setup_step1.xml    |  2 +-
 .../layout/fragment_keys_backup_setup_step2.xml    |  2 +-
 .../layout/fragment_keys_backup_setup_step3.xml    |  2 +-
 .../main/res/layout/fragment_matrix_profile.xml    |  2 +-
 .../layout/fragment_recyclerview_with_search.xml   |  2 +-
 .../src/main/res/layout/fragment_room_detail.xml   |  2 +-
 .../layout/fragment_room_preview_no_preview.xml    |  2 +-
 .../res/layout/fragment_room_setting_generic.xml   |  2 +-
 .../src/main/res/layout/fragment_room_uploads.xml  |  2 +-
 .../main/res/layout/fragment_space_add_rooms.xml   |  2 +-
 .../fragment_space_create_choose_private_model.xml |  2 +-
 .../src/main/res/layout/fragment_space_preview.xml |  2 +-
 .../res/layout/fragment_ssss_access_from_key.xml   |  2 +-
 .../fragment_ssss_access_from_passphrase.xml       |  4 ++--
 .../main/res/layout/fragment_ssss_reset_all.xml    |  2 +-
 .../main/res/layout/fragment_user_code_show.xml    |  2 +-
 .../main/res/layout/fragment_user_directory.xml    |  2 +-
 vector/src/main/res/layout/fragment_user_list.xml  |  2 +-
 .../main/res/layout/item_bottom_sheet_title.xml    |  2 +-
 vector/src/main/res/layout/item_help_footer.xml    |  2 +-
 vector/src/main/res/layout/item_pushgateway.xml    |  2 +-
 .../main/res/layout/item_room_alias_text_input.xml |  4 ++--
 .../res/layout/item_settings_section_title.xml     |  2 +-
 .../main/res/layout/item_simple_reaction_info.xml  |  2 +-
 .../layout/item_user_directory_letter_header.xml   |  2 +-
 .../src/main/res/layout/item_user_list_header.xml  |  2 +-
 .../main/res/layout/view_keys_backup_banner.xml    |  2 +-
 .../view_sign_out_bottom_sheet_action_button.xml   |  2 +-
 43 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
index eb80afd3a1..870576b55e 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
@@ -13,13 +13,13 @@
         android:text="TextAppearance.Vector.Title\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Title.M"
+        style="@style/TextView.Vector.Title.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextAppearance.Vector.Title.M\nline 2" />
+        android:text="TextAppearance.Vector.Title.Medium\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
@@ -31,10 +31,10 @@
         android:text="TextAppearance.Vector.Subtitle\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Subtitle.M"
+        style="@style/TextView.Vector.Subtitle.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextAppearance.Vector.Subtitle.M\nline 2" />
+        android:text="TextAppearance.Vector.Subtitle.Medium\nline 2" />
 
     <TextView
         style="@style/TextView.Vector.Body"
@@ -43,10 +43,10 @@
         android:text="TextAppearance.Vector.Body\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Body.M"
+        style="@style/TextView.Vector.Body.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextAppearance.Vector.Body.M\nline 2" />
+        android:text="TextAppearance.Vector.Body.Medium\nline 2" />
 
     <TextView
         style="@style/TextView.Vector.Caption"
diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
index bf44fd0245..2d54383b18 100644
--- a/library/ui-styles/src/main/res/values/styles_text_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -9,11 +9,11 @@
         <item name="lineHeight">32sp</item>
     </style>
 
-    <style name="TextView.Vector.Title.M">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Title.M</item>
+    <style name="TextView.Vector.Title.Medium">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Title.Medium</item>
     </style>
 
-    <style name="TextView.Vector.HeadlineM">
+    <style name="TextView.Vector.HeadlineMedium">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
     </style>
 
@@ -21,8 +21,8 @@
         <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
     </style>
 
-    <style name="TextView.Vector.Subtitle.M">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.M</item>
+    <style name="TextView.Vector.Subtitle.Medium">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.Medium</item>
     </style>
 
     <style name="TextView.Vector.Body">
@@ -30,8 +30,8 @@
         <item name="lineHeight">20sp</item>
     </style>
 
-    <style name="TextView.Vector.Body.M">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.M</item>
+    <style name="TextView.Vector.Body.Medium">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
     </style>
 
     <style name="TextView.Vector.Caption">
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index a54c6a2258..d425708b9b 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -13,7 +13,7 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Title.M">
+    <style name="TextAppearance.Vector.Title.Medium">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
@@ -34,7 +34,7 @@
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Subtitle.M">
+    <style name="TextAppearance.Vector.Subtitle.Medium">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
@@ -48,7 +48,7 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Body.M">
+    <style name="TextAppearance.Vector.Body.Medium">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 440248b9df..ce674c1497 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -31,7 +31,7 @@
 
         <TextView
             android:id="@+id/bootstrapTitleText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
index 4870bdebb6..48b3df89b7 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
@@ -16,7 +16,7 @@
 
         <TextView
             android:id="@+id/callDialPadTitle"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index 5e4874410a..139c469cfb 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -11,7 +11,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 5a65e41ba5..065d1d2a36 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -11,7 +11,7 @@
 
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 2189074749..59d2632d59 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -10,7 +10,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/keys_backup_setup_step3_copy_button_title"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 65b00219d3..676367edd5 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/otherUserNameText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index f79f5e86a0..f4adc3c3c2 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
-                style="@style/TextView.Vector.HeadlineM"
+                style="@style/TextView.Vector.HeadlineMedium"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index b2d49d26fe..b32ad45703 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/phoneBookTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index bdd02c3340..6d974793c5 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/createDirectRoomTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index 41678d7811..4eba062c80 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -40,7 +40,7 @@
 
                     <TextView
                         android:id="@+id/createRoomTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 529b213f16..dcca8fab50 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -77,7 +77,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarTitleView"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index cb0cce68c8..34f2d36ac5 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/success_text"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index 932c7f73da..c0e1882382 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_title"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 7319471f1e..0ee222acac 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_title"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 8ab6561a7d..d4c29702cb 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 8345c58acb..4e1e49ede3 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -71,7 +71,7 @@
 
                     <TextView
                         android:id="@+id/matrixProfileToolbarTitleView"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index cabde658b6..a6d807d873 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -37,7 +37,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 5d8b6c6cbb..316f406ef1 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 9cba9a955f..4ae28b1f77 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 7f3deaecd0..b023ddfb7e 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/roomSettingsToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index f4939d0341..b8874218ab 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomUploadsToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 61af81f572..aa97382f49 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -35,7 +35,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index 5bbb4d9bd0..c1dc2e313d 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,7 +13,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index d378558a1e..352b595762 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -41,7 +41,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index 13efd49c40..5ed6f458b2 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 7ea7b64c9a..df0a252240 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -98,7 +98,7 @@
 
         <TextView
             android:id="@+id/ssss_passphrase_or"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index 5004bb17d3..2b69b5f522 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/reset_title"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index b09f3a3d2f..48163f80f2 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/showUserCodeTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 58630f9149..1a7159ded4 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/userDirectoryTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 3cc2dd2c35..5e4d2f3e10 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -38,7 +38,7 @@
 
                 <TextView
                     android:id="@+id/userListTitle"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index eed9407557..d5035fda4e 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleTitle"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index fd7474d93f..9af8a09e7d 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemHelpText"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index cc80dc8f0b..1ba229f211 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKind"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_room_alias_text_input.xml b/vector/src/main/res/layout/item_room_alias_text_input.xml
index d7f5ac2164..c59cee112b 100644
--- a/vector/src/main/res/layout/item_room_alias_text_input.xml
+++ b/vector/src/main/res/layout/item_room_alias_text_input.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHash"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHomeServer"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_settings_section_title.xml b/vector/src/main/res/layout/item_settings_section_title.xml
index 369977f6ab..e888026e03 100644
--- a/vector/src/main/res/layout/item_settings_section_title.xml
+++ b/vector/src/main/res/layout/item_settings_section_title.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_section_title_text"
-    style="@style/TextView.Vector.HeadlineM"
+    style="@style/TextView.Vector.HeadlineMedium"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?vctr_header_background"
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 8d241ec46c..46c19259b9 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoKey"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index 754f370315..9c6042c1e7 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userDirectoryLetterView"
-    style="@style/TextView.Vector.HeadlineM"
+    style="@style/TextView.Vector.HeadlineMedium"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index 6360412657..3de79698ad 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userListHeaderView"
-    style="@style/TextView.Vector.HeadlineM"
+    style="@style/TextView.Vector.HeadlineMedium"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index f26625888b..400f017bc5 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_1"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
diff --git a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
index a4da54f04f..d8ee1ddca9 100644
--- a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/actionTitleText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"

From 1eee3fa0e8f95c2b569903125b39dbd71709ef8a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 10:26:46 +0200
Subject: [PATCH 38/49] Changelog

---
 newsfragment/3459.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newsfragment/3459.feature b/newsfragment/3459.feature
index eedec1dfda..ccda58f8b5 100644
--- a/newsfragment/3459.feature
+++ b/newsfragment/3459.feature
@@ -1,2 +1,2 @@
-Migrate to new colors and cleanup the style and theme
+Migrate to new colors and cleanup the style and theme. Now exported in module :library:ui-styles
 Ref: https://material.io/blog/migrate-android-material-components
\ No newline at end of file

From d7884fe4d22c3020b6f6b41514eb92f64e9582ad Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 10:40:22 +0200
Subject: [PATCH 39/49] Add doc and fix a small mistake on style

---
 .../src/main/res/values/styles_text_view.xml         |  4 ++++
 .../src/main/res/values/text_appearances.xml         | 12 +++++++++---
 .../src/main/res/layout/fragment_login_captcha.xml   |  2 +-
 vector/src/main/res/layout/fragment_login_terms.xml  |  4 ++--
 .../src/main/res/layout/fragment_login_terms_2.xml   |  2 +-
 vector/src/main/res/layout/item_policy.xml           |  4 ++--
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
index 2d54383b18..243c721eec 100644
--- a/library/ui-styles/src/main/res/values/styles_text_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!--
+        Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1336%3A17796
+    -->
+
     <style name="TextView.Vector" parent="Widget.MaterialComponents.TextView" />
 
     <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index d425708b9b..022196a49f 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Doc: https://medium.com/androiddevelopers/whats-your-text-s-appearance-f3a1729192d
-      List of supported attributes for a TextAppearance:
-      https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723-->
+    <!--
+    Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1336%3A17796
+
+    Doc: https://medium.com/androiddevelopers/whats-your-text-s-appearance-f3a1729192d
+    List of supported attributes for a TextAppearance:
+    https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723
+
+    Do not use TextAppearance style directly, use TextView.Vector style instead
+    -->
 
     <style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3">
         <item name="fontFamily">sans-serif</item>
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index 49504f1ada..66709d9517 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -22,7 +22,7 @@
 
         <TextView
             android:id="@+id/loginCaptchaNotice"
-            style="@style/TextAppearance.Vector.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index a00e48d413..7f37765a54 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -20,7 +20,7 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/TextAppearance.Vector.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextAppearance.Vector.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index b6c8f4764a..69e3ff2271 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextAppearance.Vector.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index c2edadfbb9..f32ce66607 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_title"
-        style="@style/TextAppearance.Vector.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_subtitle"
-        style="@style/TextAppearance.Vector.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"

From 1d356cd49db9a814c2173857cbbbef7e5694f0cd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 11:34:27 +0200
Subject: [PATCH 40/49] Fix some issue on menu icon colors

---
 vector/src/main/res/drawable/ic_delete_unsent_messages.xml | 2 +-
 vector/src/main/res/menu/bug_report.xml                    | 1 +
 vector/src/main/res/menu/menu_manage_space.xml             | 6 +++---
 vector/src/main/res/menu/menu_push_gateways.xml            | 1 +
 vector/src/main/res/menu/menu_space_add_room.xml           | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/drawable/ic_delete_unsent_messages.xml b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
index 24fdbc94c2..8f7beaeb20 100644
--- a/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
+++ b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="30">
   <path
       android:pathData="M8.5714,22.5C8.5714,23.6864 9.5357,25 10.7143,25H19.2857C20.4643,25 21.4286,23.4428 21.4286,22.2564V11.4711C21.4286,10.2848 20.4643,9.3141 19.2857,9.3141H10.7143C9.5357,9.3141 8.5714,10.2848 8.5714,11.4711V22.5ZM21.4286,6.0785H18.75L17.9893,5.3128C17.7964,5.1186 17.5179,5 17.2393,5H12.7607C12.4821,5 12.2036,5.1186 12.0107,5.3128L11.25,6.0785H8.5714C7.9821,6.0785 7.5,6.5639 7.5,7.1571C7.5,7.7502 7.9821,8.2356 8.5714,8.2356H21.4286C22.0179,8.2356 22.5,7.7502 22.5,7.1571C22.5,6.5639 22.0179,6.0785 21.4286,6.0785Z"
-      android:fillColor="#FE2928"/>
+      android:fillColor="?colorError"/>
 </vector>
diff --git a/vector/src/main/res/menu/bug_report.xml b/vector/src/main/res/menu/bug_report.xml
index e35028be35..a6420432cf 100755
--- a/vector/src/main/res/menu/bug_report.xml
+++ b/vector/src/main/res/menu/bug_report.xml
@@ -8,5 +8,6 @@
         android:id="@+id/ic_action_send_bug_report"
         android:icon="@drawable/ic_send"
         android:title="@string/send_bug_report"
+        app:iconTint="?colorPrimary"
         app:showAsAction="always" />
 </menu>
diff --git a/vector/src/main/res/menu/menu_manage_space.xml b/vector/src/main/res/menu/menu_manage_space.xml
index 858c3bc9c3..ac657e0df2 100644
--- a/vector/src/main/res/menu/menu_manage_space.xml
+++ b/vector/src/main/res/menu/menu_manage_space.xml
@@ -4,18 +4,18 @@
 
     <item
         android:id="@+id/action_delete"
-        android:title="@string/delete"
         android:icon="@drawable/ic_delete_unsent_messages"
+        android:title="@string/delete"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_mark_as_suggested"
         android:title="@string/space_mark_as_suggested"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_mark_as_not_suggested"
         android:title="@string/space_mark_as_not_suggested"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_push_gateways.xml b/vector/src/main/res/menu/menu_push_gateways.xml
index 15709a1f1e..99b2bca963 100644
--- a/vector/src/main/res/menu/menu_push_gateways.xml
+++ b/vector/src/main/res/menu/menu_push_gateways.xml
@@ -6,6 +6,7 @@
         android:id="@+id/refresh"
         android:icon="@drawable/ic_refresh_cw"
         android:title="@string/refresh"
+        app:iconTint="?colorPrimary"
         app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_space_add_room.xml b/vector/src/main/res/menu/menu_space_add_room.xml
index b11844673e..048b89892c 100644
--- a/vector/src/main/res/menu/menu_space_add_room.xml
+++ b/vector/src/main/res/menu/menu_space_add_room.xml
@@ -4,6 +4,5 @@
     <item
         android:id="@+id/spaceAddRoomSaveItem"
         android:title="@string/save"
-        app:iconTint="?colorSecondary"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file

From ece9d19d8caa41bf4ba53b41db0b93f541333add Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 11:59:08 +0200
Subject: [PATCH 41/49] Rename again the style to follow Android convention
 (G's review)

---
 .../main/res/layout/item_video_attachment.xml |  2 +-
 .../layout/activity_debug_button_styles.xml   | 36 +++++++++---------
 .../res/layout/activity_debug_text_view.xml   | 18 ++++-----
 .../src/main/res/values/style_snackbar.xml    |  6 +--
 .../main/res/values/styles_action_mode.xml    | 12 ++++++
 .../main/res/values/styles_app_bar_layout.xml |  9 +++++
 .../src/main/res/values/styles_buttons.xml    | 20 +++++-----
 .../src/main/res/values/styles_edit_text.xml  |  4 +-
 .../src/main/res/values/styles_login.xml      |  6 +--
 .../src/main/res/values/styles_pin_code.xml   |  2 +-
 .../src/main/res/values/styles_popup.xml      |  5 +--
 .../src/main/res/values/styles_progress.xml   |  6 +--
 .../main/res/values/styles_search_view.xml    |  2 +-
 .../main/res/values/styles_social_login.xml   | 38 +++++++++----------
 .../src/main/res/values/styles_text_view.xml  | 20 +++++-----
 .../src/main/res/values/styles_toolbar.xml    | 27 ++++---------
 .../src/main/res/values/text_appearances.xml  |  2 +-
 .../src/main/res/values/theme_dark.xml        | 36 +++++++++---------
 .../src/main/res/values/theme_light.xml       | 34 ++++++++---------
 tools/check/forbidden_strings_in_layout.txt   |  2 +-
 .../root/res/layout/fragment.xml.ftl          |  2 +-
 .../src/debug/res/layout/item_sas_emoji.xml   |  8 ++--
 .../app/features/popup/PopupAlertManager.kt   |  2 +-
 .../main/res/layout/activity_bug_report.xml   |  8 ++--
 vector/src/main/res/layout/activity_call.xml  |  6 +--
 .../res/layout/activity_call_transfer.xml     |  4 +-
 .../main/res/layout/activity_signed_out.xml   |  6 +--
 .../res/layout/activity_vector_settings.xml   |  4 +-
 .../layout/alerter_incoming_call_layout.xml   |  4 +-
 .../layout/alerter_verification_layout.xml    |  4 +-
 .../res/layout/bottom_sheet_bootstrap.xml     |  2 +-
 .../res/layout/bottom_sheet_call_dial_pad.xml |  2 +-
 .../bottom_sheet_generic_list_with_title.xml  |  2 +-
 .../layout/bottom_sheet_invited_to_space.xml  |  4 +-
 .../layout/bottom_sheet_logout_and_backup.xml |  6 +--
 .../bottom_sheet_room_widget_permission.xml   | 14 +++----
 .../layout/bottom_sheet_save_recovery_key.xml |  8 ++--
 .../res/layout/bottom_sheet_space_invite.xml  |  6 +--
 .../bottom_sheet_space_invite_chooser.xml     |  2 +-
 .../layout/bottom_sheet_space_settings.xml    |  4 +-
 .../res/layout/bottom_sheet_verification.xml  |  2 +-
 .../src/main/res/layout/composer_layout.xml   |  2 +-
 ...composer_layout_constraint_set_compact.xml |  2 +-
 ...omposer_layout_constraint_set_expanded.xml |  6 +--
 .../custom_action_item_layout_badge.xml       |  2 +-
 .../layout/dialog_background_sync_mode.xml    | 12 +++---
 .../dialog_confirmation_with_reason.xml       |  2 +-
 .../main/res/layout/dialog_device_verify.xml  | 16 ++++----
 .../res/layout/dialog_disclaimer_content.xml  |  4 +-
 .../main/res/layout/dialog_event_content.xml  |  2 +-
 .../res/layout/dialog_export_e2e_keys.xml     |  2 +-
 .../res/layout/dialog_import_e2e_keys.xml     |  2 +-
 .../res/layout/dialog_no_sticker_pack.xml     |  2 +-
 .../res/layout/dialog_prompt_password.xml     |  2 +-
 .../layout/dialog_recovery_key_saved_info.xml |  4 +-
 .../res/layout/dialog_ssl_fingerprint.xml     | 12 +++---
 .../layout/fragment_bootstrap_conclusion.xml  |  2 +-
 ...gment_bootstrap_enter_account_password.xml |  4 +-
 .../fragment_bootstrap_enter_passphrase.xml   |  6 +--
 .../fragment_bootstrap_migrate_backup.xml     |  8 ++--
 .../res/layout/fragment_bootstrap_reauth.xml  |  8 ++--
 .../layout/fragment_bootstrap_save_key.xml    |  4 +-
 .../fragment_bootstrap_setup_recovery.xml     |  4 +-
 .../res/layout/fragment_bootstrap_waiting.xml |  4 +-
 .../res/layout/fragment_contacts_book.xml     |  4 +-
 ...ent_create_direct_room_directory_users.xml |  2 +-
 .../main/res/layout/fragment_create_room.xml  |  2 +-
 .../layout/fragment_deactivate_account.xml    |  4 +-
 .../main/res/layout/fragment_home_detail.xml  |  6 +--
 .../main/res/layout/fragment_home_drawer.xml  | 10 ++---
 .../fragment_keys_backup_restore_from_key.xml |  4 +-
 ...nt_keys_backup_restore_from_passphrase.xml |  4 +-
 .../fragment_keys_backup_restore_success.xml  |  4 +-
 .../fragment_keys_backup_setup_step1.xml      |  8 ++--
 .../fragment_keys_backup_setup_step2.xml      |  8 ++--
 .../fragment_keys_backup_setup_step3.xml      | 10 ++---
 vector/src/main/res/layout/fragment_login.xml | 12 +++---
 .../layout/fragment_login_account_created.xml | 20 +++++-----
 .../res/layout/fragment_login_captcha.xml     |  2 +-
 ...fragment_login_generic_text_input_form.xml | 10 ++---
 ...agment_login_generic_text_input_form_2.xml | 14 +++----
 .../layout/fragment_login_reset_password.xml  |  6 +--
 .../fragment_login_reset_password_2.xml       | 10 ++---
 ...login_reset_password_mail_confirmation.xml |  8 ++--
 ...gin_reset_password_mail_confirmation_2.xml |  8 ++--
 .../fragment_login_reset_password_success.xml |  8 ++--
 ...ragment_login_reset_password_success_2.xml |  8 ++--
 .../fragment_login_server_selection.xml       | 16 ++++----
 .../fragment_login_server_selection_2.xml     | 14 +++----
 .../layout/fragment_login_server_url_form.xml | 12 +++---
 .../fragment_login_server_url_form_2.xml      |  6 +--
 .../fragment_login_signin_password_2.xml      | 10 ++---
 .../layout/fragment_login_signin_to_any_2.xml |  8 ++--
 .../fragment_login_signin_username_2.xml      | 10 ++---
 .../fragment_login_signup_password_2.xml      | 12 +++---
 ...fragment_login_signup_signin_selection.xml | 10 ++---
 .../fragment_login_signup_username_2.xml      | 10 ++---
 .../main/res/layout/fragment_login_splash.xml | 12 +++---
 .../res/layout/fragment_login_splash_2.xml    | 14 +++----
 .../res/layout/fragment_login_sso_only_2.xml  |  4 +-
 .../main/res/layout/fragment_login_terms.xml  |  6 +--
 .../res/layout/fragment_login_terms_2.xml     |  6 +--
 .../layout/fragment_login_wait_for_email.xml  |  4 +-
 .../fragment_login_wait_for_email_2.xml       |  8 ++--
 .../res/layout/fragment_matrix_profile.xml    |  2 +-
 .../fragment_matrix_to_room_space_card.xml    | 14 +++----
 .../layout/fragment_matrix_to_user_card.xml   |  4 +-
 .../main/res/layout/fragment_public_rooms.xml |  2 +-
 .../res/layout/fragment_reauth_confirm.xml    |  6 +--
 .../fragment_recyclerview_with_search.xml     |  4 +-
 .../main/res/layout/fragment_review_terms.xml |  2 +-
 .../main/res/layout/fragment_room_detail.xml  |  4 +-
 .../fragment_room_preview_no_preview.xml      | 12 +++---
 .../layout/fragment_room_setting_generic.xml  |  2 +-
 .../main/res/layout/fragment_room_uploads.xml |  2 +-
 .../main/res/layout/fragment_room_widget.xml  |  2 +-
 .../layout/fragment_set_identity_server.xml   |  8 ++--
 ...nt_settings_notifications_troubleshoot.xml |  4 +-
 .../res/layout/fragment_space_add_rooms.xml   |  6 +--
 ...ment_space_create_choose_private_model.xml |  4 +-
 .../fragment_space_create_choose_type.xml     |  8 ++--
 .../res/layout/fragment_space_preview.xml     |  8 ++--
 .../layout/fragment_ssss_access_from_key.xml  |  8 ++--
 .../fragment_ssss_access_from_passphrase.xml  | 10 ++---
 .../res/layout/fragment_ssss_reset_all.xml    | 14 +++----
 .../res/layout/fragment_user_code_show.xml    | 10 ++---
 .../res/layout/fragment_user_directory.xml    |  2 +-
 .../main/res/layout/fragment_user_list.xml    |  4 +-
 .../main/res/layout/grid_section_header.xml   |  2 +-
 .../res/layout/item_autocomplete_command.xml  |  6 +--
 .../res/layout/item_autocomplete_emoji.xml    |  6 +--
 .../layout/item_autocomplete_matrix_item.xml  |  4 +-
 .../layout/item_autocomplete_more_result.xml  |  2 +-
 .../res/layout/item_bottom_sheet_action.xml   |  2 +-
 .../item_bottom_sheet_message_preview.xml     |  8 ++--
 .../item_bottom_sheet_message_status.xml      |  2 +-
 .../item_bottom_sheet_quick_reaction.xml      | 16 ++++----
 .../res/layout/item_bottom_sheet_radio.xml    |  4 +-
 .../layout/item_bottom_sheet_room_preview.xml |  2 +-
 .../res/layout/item_bottom_sheet_title.xml    |  4 +-
 .../src/main/res/layout/item_breadcrumbs.xml  |  4 +-
 .../res/layout/item_completion_homeserver.xml |  2 +-
 .../main/res/layout/item_contact_action.xml   |  2 +-
 .../main/res/layout/item_contact_detail.xml   |  4 +-
 .../src/main/res/layout/item_contact_main.xml |  2 +-
 .../layout/item_create_direct_room_user.xml   |  4 +-
 vector/src/main/res/layout/item_device.xml    | 14 +++----
 .../src/main/res/layout/item_emoji_result.xml |  6 +--
 .../src/main/res/layout/item_emoji_verif.xml  |  4 +-
 .../src/main/res/layout/item_error_retry.xml  |  2 +-
 .../res/layout/item_expandable_textview.xml   |  2 +-
 .../res/layout/item_form_advanced_toggle.xml  |  2 +-
 .../src/main/res/layout/item_form_switch.xml  |  4 +-
 .../main/res/layout/item_generic_button.xml   |  2 +-
 .../res/layout/item_generic_empty_state.xml   |  4 +-
 .../main/res/layout/item_generic_footer.xml   |  2 +-
 .../main/res/layout/item_generic_header.xml   |  2 +-
 .../src/main/res/layout/item_generic_list.xml |  6 +--
 .../res/layout/item_generic_pill_footer.xml   |  2 +-
 .../res/layout/item_generic_with_value.xml    |  4 +-
 vector/src/main/res/layout/item_group.xml     |  2 +-
 .../src/main/res/layout/item_help_footer.xml  |  2 +-
 ...tem_keys_backup_settings_button_footer.xml |  2 +-
 .../src/main/res/layout/item_known_user.xml   |  4 +-
 vector/src/main/res/layout/item_loading.xml   |  2 +-
 vector/src/main/res/layout/item_locale.xml    |  4 +-
 .../res/layout/item_login_centered_button.xml |  2 +-
 .../res/layout/item_login_error_retry.xml     |  2 +-
 .../res/layout/item_login_password_form.xml   |  4 +-
 .../main/res/layout/item_login_red_button.xml |  2 +-
 .../src/main/res/layout/item_login_text.xml   |  2 +-
 .../src/main/res/layout/item_login_title.xml  |  2 +-
 .../res/layout/item_login_title_small.xml     |  2 +-
 vector/src/main/res/layout/item_no_result.xml |  2 +-
 .../layout/item_notification_troubleshoot.xml |  4 +-
 vector/src/main/res/layout/item_policy.xml    |  4 +-
 .../main/res/layout/item_positive_button.xml  |  2 +-
 .../main/res/layout/item_profile_action.xml   |  4 +-
 .../res/layout/item_profile_matrix_item.xml   |  6 +--
 .../item_profile_matrix_item_progress.xml     |  4 +-
 .../main/res/layout/item_profile_section.xml  |  2 +-
 .../src/main/res/layout/item_public_room.xml  |  8 ++--
 .../src/main/res/layout/item_pushgateway.xml  | 26 ++++++-------
 .../src/main/res/layout/item_pushrule_raw.xml |  4 +-
 vector/src/main/res/layout/item_room.xml      | 10 ++---
 .../res/layout/item_room_alias_text_input.xml |  4 +-
 .../main/res/layout/item_room_category.xml    |  4 +-
 .../main/res/layout/item_room_directory.xml   |  4 +-
 .../res/layout/item_room_directory_server.xml |  4 +-
 .../res/layout/item_room_filter_footer.xml    |  8 ++--
 .../main/res/layout/item_room_invitation.xml  |  4 +-
 .../res/layout/item_room_to_add_in_space.xml  |  2 +-
 .../layout/item_room_to_manage_in_space.xml   |  4 +-
 .../main/res/layout/item_search_result.xml    |  6 +--
 .../main/res/layout/item_settings_button.xml  |  2 +-
 .../item_settings_button_single_line.xml      |  4 +-
 .../layout/item_settings_continue_cancel.xml  |  4 +-
 .../res/layout/item_settings_edit_text.xml    |  2 +-
 .../res/layout/item_settings_helper_info.xml  |  2 +-
 .../res/layout/item_settings_information.xml  |  2 +-
 .../layout/item_settings_section_title.xml    |  2 +-
 .../res/layout/item_settings_simple_item.xml  |  4 +-
 .../res/layout/item_settings_three_pid.xml    |  2 +-
 .../res/layout/item_simple_reaction_info.xml  |  2 +-
 vector/src/main/res/layout/item_space.xml     |  6 +--
 vector/src/main/res/layout/item_space_add.xml |  2 +-
 .../res/layout/item_space_beta_header.xml     |  6 +--
 .../main/res/layout/item_space_roomchild.xml  |  6 +--
 .../main/res/layout/item_space_subspace.xml   |  2 +-
 .../res/layout/item_space_top_summary.xml     |  4 +-
 vector/src/main/res/layout/item_sub_space.xml |  4 +-
 .../main/res/layout/item_suggested_room.xml   |  6 +--
 .../res/layout/item_timeline_event_base.xml   |  4 +-
 .../item_timeline_event_call_tile_stub.xml    | 10 ++---
 .../item_timeline_event_code_block_stub.xml   |  4 +-
 .../res/layout/item_timeline_event_create.xml |  2 +-
 .../item_timeline_event_day_separator.xml     |  2 +-
 .../item_timeline_event_default_stub.xml      |  2 +-
 .../layout/item_timeline_event_file_stub.xml  |  2 +-
 ...item_timeline_event_merged_header_stub.xml |  4 +-
 ...meline_event_merged_room_creation_stub.xml | 12 +++---
 .../item_timeline_event_merged_utd_stub.xml   |  6 +--
 .../item_timeline_event_notice_stub.xml       |  2 +-
 ...tem_timeline_event_option_buttons_stub.xml |  4 +-
 .../layout/item_timeline_event_poll_stub.xml  | 14 +++----
 .../item_timeline_event_redacted_stub.xml     |  2 +-
 .../item_timeline_event_status_tile_stub.xml  |  4 +-
 .../item_timeline_event_text_message_stub.xml |  2 +-
 .../item_timeline_event_verification_stub.xml | 10 ++---
 .../item_timeline_event_widget_stub.xml       |  2 +-
 .../res/layout/item_timeline_read_marker.xml  |  2 +-
 vector/src/main/res/layout/item_tos.xml       |  4 +-
 .../src/main/res/layout/item_unknown_room.xml |  2 +-
 .../src/main/res/layout/item_uploads_file.xml |  4 +-
 vector/src/main/res/layout/item_user.xml      |  4 +-
 .../item_user_directory_letter_header.xml     |  2 +-
 .../main/res/layout/item_user_list_header.xml |  2 +-
 .../res/layout/item_verification_action.xml   |  4 +-
 .../layout/item_verification_decimal_code.xml |  2 +-
 .../res/layout/item_verification_notice.xml   |  2 +-
 .../res/layout/item_verification_wait.xml     |  8 ++--
 .../res/layout/item_verification_waiting.xml  |  2 +-
 .../media_upload_download_progress_layout.xml |  2 +-
 .../layout/merge_image_attachment_overlay.xml |  4 +-
 .../res/layout/merge_overlay_waiting_view.xml |  2 +-
 vector/src/main/res/layout/option_buttons.xml |  2 +-
 .../src/main/res/layout/reaction_button.xml   |  4 +-
 .../vector_home_badge_unread_layout.xml       |  2 +-
 .../main/res/layout/vector_invite_view.xml    |  6 +--
 .../layout/vector_preference_push_rule.xml    |  4 +-
 .../layout/view_active_conference_view.xml    |  4 +-
 .../view_bottom_sheet_action_button.xml       |  4 +-
 .../src/main/res/layout/view_button_state.xml |  4 +-
 .../main/res/layout/view_current_calls.xml    |  4 +-
 .../layout/view_failed_messages_warning.xml   |  4 +-
 vector/src/main/res/layout/view_file_icon.xml |  2 +-
 .../res/layout/view_jump_to_read_marker.xml   |  2 +-
 .../res/layout/view_keys_backup_banner.xml    |  4 +-
 .../res/layout/view_notification_area.xml     |  2 +-
 .../main/res/layout/view_poll_result_line.xml |  4 +-
 .../src/main/res/layout/view_read_marker.xml  |  2 +-
 .../main/res/layout/view_read_receipts.xml    |  2 +-
 .../res/layout/view_room_widgets_banner.xml   |  4 +-
 ...ew_sign_out_bottom_sheet_action_button.xml |  2 +-
 .../res/layout/view_space_type_button.xml     |  4 +-
 vector/src/main/res/layout/view_state.xml     |  6 +--
 .../view_stub_room_member_profile_header.xml  |  8 ++--
 .../layout/view_stub_room_profile_header.xml  |  4 +-
 .../src/main/res/layout/view_sync_state.xml   |  6 +--
 .../src/main/res/layout/view_url_preview.xml  |  6 +--
 270 files changed, 776 insertions(+), 771 deletions(-)
 create mode 100644 library/ui-styles/src/main/res/values/styles_action_mode.xml
 create mode 100644 library/ui-styles/src/main/res/values/styles_app_bar_layout.xml

diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
index ab7a33f258..7dd13ea460 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/videoMediaViewerErrorView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
index 7d251b8af7..0f129fb406 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
@@ -12,100 +12,100 @@
         android:orientation="vertical"
         android:padding="16dp">
 
-        <!-- Note: Default style is @style/Button.Vector.Style in the theme -->
+        <!-- Note: Default style is @style/Widget.Vector.Button in the theme -->
         <Button
-            style="@style/Button.Vector.Style"
+            style="@style/Widget.Vector.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Default" />
 
         <Button
-            style="@style/Button.Vector.Style"
+            style="@style/Widget.Vector.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Line1\nLine 2" />
 
         <Button
-            style="@style/Button.Vector.Style"
+            style="@style/Widget.Vector.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Default disabled" />
 
         <Button
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Text" />
 
         <Button
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Text disabled" />
 
         <Button
-            style="@style/Button.Vector.Style.Positive"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Positive" />
 
         <Button
-            style="@style/Button.Vector.Style.Positive"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Positive disabled" />
 
         <Button
-            style="@style/Button.Vector.Style.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Destructive" />
 
         <Button
-            style="@style/Button.Vector.Style.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Destructive disabled" />
 
         <Button
-            style="@style/Button.Vector.Style.Unelevated.Bot"
+            style="@style/Widget.Vector.Button.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Bot" />
 
         <Button
-            style="@style/Button.Vector.Style.Unelevated.Bot"
+            style="@style/Widget.Vector.Button.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Bot disabled" />
 
         <Button
-            style="@style/Button.Vector.Style.Outlined"
+            style="@style/Widget.Vector.Button.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
             android:text="Outline" />
 
         <Button
-            style="@style/Button.Vector.Style.Outlined"
+            style="@style/Widget.Vector.Button.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Outline disabled" />
 
         <Button
-            style="@style/Button.Vector.Style.Outlined.Poll"
+            style="@style/Widget.Vector.Button.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Poll " />
 
         <Button
-            style="@style/Button.Vector.Style.Outlined.Poll"
+            style="@style/Widget.Vector.Button.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
@@ -119,14 +119,14 @@
             android:padding="8dp">
 
             <Button
-                style="@style/Button.Vector.Style.Text.Alerter"
+                style="@style/Widget.Vector.Button.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="Alerter" />
 
             <Button
-                style="@style/Button.Vector.Style.Text.Alerter"
+                style="@style/Widget.Vector.Button.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="false"
diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
index 870576b55e..0c16f889ec 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
@@ -7,55 +7,55 @@
     tools:ignore="HardcodedText">
 
     <TextView
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Title\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Title.Medium"
+        style="@style/Widget.Vector.TextView.Title.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Title.Medium\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Subtitle\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Subtitle.Medium"
+        style="@style/Widget.Vector.TextView.Subtitle.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Subtitle.Medium\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Body\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Body.Medium"
+        style="@style/Widget.Vector.TextView.Body.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Body.Medium\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Caption\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Micro\nline 2" />
diff --git a/library/ui-styles/src/main/res/values/style_snackbar.xml b/library/ui-styles/src/main/res/values/style_snackbar.xml
index d1c7319813..d15f846d8f 100644
--- a/library/ui-styles/src/main/res/values/style_snackbar.xml
+++ b/library/ui-styles/src/main/res/values/style_snackbar.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="SnackBar.Vector.Style" parent="@style/Widget.MaterialComponents.Snackbar">
+    <style name="Widget.Vector.SnackBar" parent="@style/Widget.MaterialComponents.Snackbar">
 <!--        <item name="android:background">@color/notification_accent_color</item>-->
     </style>
 
-    <style name="SnackBar.Vector.Button" parent="@style/Button.Vector.Style.Text.OnPrimary">
+    <style name="Widget.Vector.SnackBar.Button" parent="@style/Widget.Vector.Button.Text.OnPrimary">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 
-    <style name="SnackBar.Vector.Text" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+    <style name="Widget.Vector.SnackBar.TextView" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/styles_action_mode.xml b/library/ui-styles/src/main/res/values/styles_action_mode.xml
new file mode 100644
index 0000000000..f6e6079633
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_action_mode.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Action mode style -->
+    <style name="Widget.Vector.ActionMode" parent="Widget.AppCompat.ActionMode">
+        <item name="background">?android:colorBackground</item>
+        <item name="titleTextStyle">@style/Widget.Vector.TextView.Title</item>
+        <item name="subtitleTextStyle">@style/Widget.Vector.TextView.Subtitle</item>
+        <item name="actionMenuTextColor">?colorOnPrimary</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_app_bar_layout.xml b/library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
new file mode 100644
index 0000000000..973a2c5e4a
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.Vector.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Primary">
+        <item name="android:background">?vctr_toolbar_background</item>
+        <item name="elevation">4dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
index 3d779fe115..8d34995751 100644
--- a/library/ui-styles/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Button.Vector.Style" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Vector.Button" parent="Widget.MaterialComponents.Button">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
@@ -9,7 +9,7 @@
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="Button.Vector.Style.Destructive">
+    <style name="Widget.Vector.Button.Destructive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
     </style>
@@ -18,7 +18,7 @@
         <item name="colorPrimary">?colorError</item>
     </style>
 
-    <style name="Button.Vector.Style.Positive">
+    <style name="Widget.Vector.Button.Positive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
     </style>
@@ -27,7 +27,7 @@
         <!-- Keep default colors from the theme -->
     </style>
 
-    <style name="Button.Vector.Style.Unelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+    <style name="Widget.Vector.Button.Unelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
@@ -35,7 +35,7 @@
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="Button.Vector.Style.Unelevated.Bot">
+    <style name="Widget.Vector.Button.Unelevated.Bot">
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayBot</item>
     </style>
 
@@ -44,19 +44,19 @@
         <item name="colorOnPrimary">@color/button_bot_enabled_text_color</item>
     </style>
 
-    <style name="Button.Vector.Style.Text" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Widget.Vector.Button.Text" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="colorControlHighlight">?colorSecondary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="Button.Vector.Style.Text.OnPrimary">
+    <style name="Widget.Vector.Button.Text.OnPrimary">
         <item name="colorControlHighlight">?colorOnPrimary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
     </style>
 
-    <style name="Button.Vector.Style.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Widget.Vector.Button.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textAllCaps">false</item>
         <item name="strokeColor">@color/button_background_tint_selector</item>
         <item name="strokeWidth">1dp</item>
@@ -64,7 +64,7 @@
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="Button.Vector.Style.Text.Alerter">
+    <style name="Widget.Vector.Button.Text.Alerter">
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">false</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
@@ -74,7 +74,7 @@
         <item name="colorPrimary">?colorOnPrimary</item>
     </style>
 
-    <style name="Button.Vector.Style.Outlined.Poll">
+    <style name="Widget.Vector.Button.Outlined.Poll">
         <item name="android:minHeight">44dp</item>
         <item name="cornerRadius">10dp</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
index f0703135fa..d23c11c96c 100644
--- a/library/ui-styles/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -2,9 +2,9 @@
 <resources>
 
     <!-- Default style for TextInputLayout -->
-    <style name="TextInputLayout.Vector" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
+    <style name="Widget.Vector.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
 
-    <style name="EditText.Vector.Composer" parent="Widget.AppCompat.EditText">
+    <style name="Widget.Vector.EditText.Composer" parent="Widget.AppCompat.EditText">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
         <item name="android:maxLines">12</item>
diff --git a/library/ui-styles/src/main/res/values/styles_login.xml b/library/ui-styles/src/main/res/values/styles_login.xml
index a5293dcb66..ab2cb44c5a 100644
--- a/library/ui-styles/src/main/res/values/styles_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_login.xml
@@ -35,17 +35,17 @@
         <item name="android:paddingBottom">32dp</item>
     </style>
 
-    <style name="Button.Vector.Style.Login">
+    <style name="Widget.Vector.Button.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Button.Vector.Style.Login.Outlined" parent="Button.Vector.Style.Outlined">
+    <style name="Widget.Vector.Button.Outlined.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Button.Vector.Style.Login.Text" parent="Button.Vector.Style.Text">
+    <style name="Widget.Vector.Button.Text.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_pin_code.xml b/library/ui-styles/src/main/res/values/styles_pin_code.xml
index 11ededa2f0..2b6c113359 100644
--- a/library/ui-styles/src/main/res/values/styles_pin_code.xml
+++ b/library/ui-styles/src/main/res/values/styles_pin_code.xml
@@ -15,7 +15,7 @@
         <item name="android:button">@drawable/pin_code_dots</item>
     </style>
 
-    <style name="PinCodeNextButtonStyle" parent="Button.Vector.Style">
+    <style name="PinCodeNextButtonStyle" parent="Widget.Vector.Button">
         <item name="android:textSize">18sp</item>
         <item name="android:backgroundTint">@android:color/transparent</item>
         <item name="android:layout_marginBottom">24dp</item>
diff --git a/library/ui-styles/src/main/res/values/styles_popup.xml b/library/ui-styles/src/main/res/values/styles_popup.xml
index c7b089e94c..2aad848989 100644
--- a/library/ui-styles/src/main/res/values/styles_popup.xml
+++ b/library/ui-styles/src/main/res/values/styles_popup.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="PopupMenu.Vector.Base" parent="Widget.AppCompat.PopupMenu">
+    <style name="Widget.Vector.PopupMenu" parent="Widget.AppCompat.PopupMenu">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:textSize">16sp</item>
         <item name="android:dropDownHorizontalOffset">0dp</item>
         <item name="android:dropDownVerticalOffset">0dp</item>
     </style>
 
-    <style name="PopupMenu.Vector" parent="PopupMenu.Vector.Base" />
-
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_progress.xml b/library/ui-styles/src/main/res/values/styles_progress.xml
index fa976f3ba7..712e7e98b6 100644
--- a/library/ui-styles/src/main/res/values/styles_progress.xml
+++ b/library/ui-styles/src/main/res/values/styles_progress.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="ProgressBar.Vector.File" parent="Widget.AppCompat.ProgressBar.Horizontal">
+    <style name="Widget.Vector.ProgressBar.Horizontal" parent="Widget.AppCompat.ProgressBar.Horizontal" />
+
+    <style name="Widget.Vector.ProgressBar.Horizontal.File">
         <item name="android:indeterminateOnly">false</item>
         <item name="android:progressDrawable">@drawable/file_progress_bar</item>
         <item name="android:minHeight">10dp</item>
         <item name="android:maxHeight">40dp</item>
     </style>
 
-    <style name="ProgressBar.Vector.Horizontal" parent="Widget.AppCompat.ProgressBar.Horizontal" />
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_search_view.xml b/library/ui-styles/src/main/res/values/styles_search_view.xml
index a714b1aac2..e1439697c9 100644
--- a/library/ui-styles/src/main/res/values/styles_search_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_search_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="SearchView.Vector" parent="Widget.AppCompat.SearchView">
+    <style name="Widget.Vector.SearchView" parent="Widget.AppCompat.SearchView">
         <item name="searchIcon">@drawable/ic_search</item>
         <item name="closeIcon">@drawable/ic_x_gray</item>
         <item name="iconifiedByDefault">false</item>
diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index dd662eb3ba..b527d5bfdc 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Button.Vector.SocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin">
         <item name="android:textAllCaps">false</item>
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:layout_width">wrap_content</item>
@@ -17,44 +17,44 @@
         <item name="strokeColor">@color/black_54</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Google">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Google">
         <item name="icon">@drawable/ic_social_google</item>
         <item name="iconTint">@android:color/transparent</item>
         <item name="iconTintMode">add</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Google.Light">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Google.Light">
         <item name="android:backgroundTint">@color/button_social_google_background_selector_light</item>
         <item name="android:textColor">@color/black_54</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Google.Dark">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Google.Dark">
         <item name="android:backgroundTint">@color/button_social_google_background_selector_dark</item>
         <item name="android:textColor">@android:color/white</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Github">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Github">
         <item name="icon">@drawable/ic_social_github</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Github.Light">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Github.Light">
         <item name="iconTint">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Github.Dark">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Github.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
 
-    <style name="Button.Vector.SocialLogin.Facebook">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook">
         <item name="icon">@drawable/ic_social_facebook</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Facebook.Light">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook.Light">
         <item name="strokeColor">#3877EA</item>
         <item name="strokeWidth">1dp</item>
         <item name="iconTint">#3877EA</item>
@@ -62,58 +62,58 @@
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Facebook.Dark">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">#3877EA</item>
     </style>
 
 
-    <style name="Button.Vector.SocialLogin.Twitter">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter">
         <item name="icon">@drawable/ic_social_twitter</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Twitter.Light">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light">
         <item name="iconTint">#5D9EC9</item>
         <item name="android:textColor">#5D9EC9</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Twitter.Dark">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">#5D9EC9</item>
     </style>
 
 
-    <style name="Button.Vector.SocialLogin.Apple">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple">
         <item name="icon">@drawable/ic_social_apple</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Apple.Light">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple.Light">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Apple.Dark">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark">
         <item name="iconTint">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Gitlab">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Gitlab">
         <item name="icon">@drawable/ic_social_gitlab</item>
         <item name="iconTint">@android:color/transparent</item>
         <item name="iconTintMode">add</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Gitlab.Light">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light">
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="Button.Vector.SocialLogin.Gitlab.Dark">
+    <style name="Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark">
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
index 243c721eec..77e32da345 100644
--- a/library/ui-styles/src/main/res/values/styles_text_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -5,45 +5,45 @@
         Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1336%3A17796
     -->
 
-    <style name="TextView.Vector" parent="Widget.MaterialComponents.TextView" />
+    <style name="Widget.Vector.TextView" parent="Widget.MaterialComponents.TextView" />
 
     <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
-    <style name="TextView.Vector.Title">
+    <style name="Widget.Vector.TextView.Title">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
         <item name="lineHeight">32sp</item>
     </style>
 
-    <style name="TextView.Vector.Title.Medium">
+    <style name="Widget.Vector.TextView.Title.Medium">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Title.Medium</item>
     </style>
 
-    <style name="TextView.Vector.HeadlineMedium">
+    <style name="Widget.Vector.TextView.HeadlineMedium">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
     </style>
 
-    <style name="TextView.Vector.Subtitle">
+    <style name="Widget.Vector.TextView.Subtitle">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
     </style>
 
-    <style name="TextView.Vector.Subtitle.Medium">
+    <style name="Widget.Vector.TextView.Subtitle.Medium">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.Medium</item>
     </style>
 
-    <style name="TextView.Vector.Body">
+    <style name="Widget.Vector.TextView.Body">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
         <item name="lineHeight">20sp</item>
     </style>
 
-    <style name="TextView.Vector.Body.Medium">
+    <style name="Widget.Vector.TextView.Body.Medium">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
     </style>
 
-    <style name="TextView.Vector.Caption">
+    <style name="Widget.Vector.TextView.Caption">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
         <item name="lineHeight">16sp</item>
     </style>
 
-    <style name="TextView.Vector.Micro">
+    <style name="Widget.Vector.TextView.Micro">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
         <item name="lineHeight">16sp</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
index ab18abfdab..9f6ba102ed 100644
--- a/library/ui-styles/src/main/res/values/styles_toolbar.xml
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -1,51 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppBarLayout.Vector.Style" parent="Widget.MaterialComponents.AppBarLayout.Primary">
-        <item name="android:background">?vctr_toolbar_background</item>
-        <item name="elevation">4dp</item>
-    </style>
-
-    <style name="Toolbar.Vector.Base" parent="Widget.MaterialComponents.Toolbar">
+    <style name="Widget.Vector.Toolbar.Base" parent="Widget.MaterialComponents.Toolbar">
         <item name="android:background">?vctr_toolbar_background</item>
         <item name="elevation">0dp</item>
 
         <!-- main text -->
-        <item name="titleTextStyle">@style/TextView.Vector.ActrionBarTitle</item>
+        <item name="titleTextStyle">@style/Widget.Vector.TextView.ActionBarTitle</item>
 
         <!-- sub text -->
-        <item name="subtitleTextStyle">@style/TextView.Vector.ActrionBarSubTitle</item>
+        <item name="subtitleTextStyle">@style/Widget.Vector.TextView.ActionBarSubTitle</item>
     </style>
 
     <!-- Default toolbar style -->
-    <style name="Toolbar.Vector" parent="Toolbar.Vector.Base">
+    <style name="Widget.Vector.Toolbar" parent="Widget.Vector.Toolbar.Base">
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>
 
     <!-- Toolbar for settings Activity (so we keep the default contentInsetStartWithNavigation here) -->
-    <style name="Toolbar.Vector.Settings" parent="Toolbar.Vector.Base" />
+    <style name="Widget.Vector.Toolbar.Settings" parent="Widget.Vector.Toolbar.Base" />
 
     <!-- Toolbar text style -->
     <!-- main text -->
-    <style name="TextView.Vector.ActrionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+    <style name="Widget.Vector.TextView.ActionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:fontFamily">"sans-serif-medium"</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <!-- sub text -->
-    <style name="TextView.Vector.ActrionBarSubTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
+    <style name="Widget.Vector.TextView.ActionBarSubTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:fontFamily">"sans-serif-medium"</item>
         <item name="android:textSize">12sp</item>
     </style>
 
-    <!-- Action mode style -->
-    <style name="ActionMode.Vector.Style" parent="Widget.AppCompat.ActionMode">
-        <item name="background">?android:colorBackground</item>
-        <item name="titleTextStyle">@style/TextView.Vector.Title</item>
-        <item name="subtitleTextStyle">@style/TextView.Vector.Subtitle</item>
-        <item name="actionMenuTextColor">?colorOnPrimary</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index 022196a49f..88192f70e6 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -8,7 +8,7 @@
     List of supported attributes for a TextAppearance:
     https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723
 
-    Do not use TextAppearance style directly, use TextView.Vector style instead
+    Do not use TextAppearance directly, use Widget.Vector.TextView style instead
     -->
 
     <style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3">
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index a5188131b2..256ee72c2d 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -67,26 +67,26 @@
         <item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
         <!-- Default Text appearance for TextViews -->
         <item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
-        <!-- Text appearance for List item (TODO Check that this is used in Preference Screen -->
+        <!-- Text appearance for List item -->
         <item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
         <item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
         <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/TextView.Vector.Body</item>
-        <item name="materialButtonStyle">@style/Button.Vector.Style</item>
-        <item name="toolbarStyle">@style/Toolbar.Vector</item>
+        <item name="android:textViewStyle">@style/Widget.Vector.TextView.Body</item>
+        <item name="materialButtonStyle">@style/Widget.Vector.Button</item>
+        <item name="toolbarStyle">@style/Widget.Vector.Toolbar</item>
         <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Dark</item>
         <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
-        <item name="searchViewStyle">@style/SearchView.Vector</item>
-        <item name="textInputStyle">@style/TextInputLayout.Vector</item>
-        <item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
-        <item name="popupMenuStyle">@style/PopupMenu.Vector</item>
+        <item name="searchViewStyle">@style/Widget.Vector.SearchView</item>
+        <item name="textInputStyle">@style/Widget.Vector.TextInputLayout</item>
+        <item name="appBarLayoutStyle">@style/Widget.Vector.AppBarLayout</item>
+        <item name="popupMenuStyle">@style/Widget.Vector.PopupMenu</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Dark</item>
-        <item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
-        <item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
-        <item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
-        <item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
+        <item name="snackbarStyle">@style/Widget.Vector.SnackBar</item>
+        <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
+        <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
+        <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
 
         <item name="android:textColorLink">@color/element_link_dark</item>
 
@@ -124,12 +124,12 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Dark</item>
-        <item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Dark</item>
-        <item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Dark</item>
-        <item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Dark</item>
-        <item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Dark</item>
-        <item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Dark</item>
+        <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark</item>
+        <item name="vctr_social_login_button_github_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Dark</item>
+        <item name="vctr_social_login_button_facebook_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark</item>
+        <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>
+        <item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark</item>
+        <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index d2c659a599..49cd85e4d0 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -73,20 +73,20 @@
         <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/TextView.Vector.Body</item>
-        <item name="materialButtonStyle">@style/Button.Vector.Style</item>
-        <item name="toolbarStyle">@style/Toolbar.Vector</item>
+        <item name="android:textViewStyle">@style/Widget.Vector.TextView.Body</item>
+        <item name="materialButtonStyle">@style/Widget.Vector.Button</item>
+        <item name="toolbarStyle">@style/Widget.Vector.Toolbar</item>
         <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Light</item>
         <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
-        <item name="searchViewStyle">@style/SearchView.Vector</item>
-        <item name="textInputStyle">@style/TextInputLayout.Vector</item>
-        <item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
-        <item name="popupMenuStyle">@style/PopupMenu.Vector</item>
+        <item name="searchViewStyle">@style/Widget.Vector.SearchView</item>
+        <item name="textInputStyle">@style/Widget.Vector.TextInputLayout</item>
+        <item name="appBarLayoutStyle">@style/Widget.Vector.AppBarLayout</item>
+        <item name="popupMenuStyle">@style/Widget.Vector.PopupMenu</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Light</item>
-        <item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
-        <item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
-        <item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
-        <item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
+        <item name="snackbarStyle">@style/Widget.Vector.SnackBar</item>
+        <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
+        <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
+        <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
 
         <item name="android:textColorLink">@color/element_link_light</item>
 
@@ -126,12 +126,12 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Light</item>
-        <item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Light</item>
-        <item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Light</item>
-        <item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Light</item>
-        <item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Light</item>
-        <item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Light</item>
+        <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light</item>
+        <item name="vctr_social_login_button_github_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Light</item>
+        <item name="vctr_social_login_button_facebook_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Light</item>
+        <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light</item>
+        <item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light</item>
+        <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
index 838269f156..09f0d01f69 100644
--- a/tools/check/forbidden_strings_in_layout.txt
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -23,5 +23,5 @@
 
 # Extension:xml
 
-### Use style="@style/TextView.Vector.*" instead of textSize attribute
+### Use style="@style/Widget.Vector.TextView.*" instead of textSize attribute
 android:textSize===9
diff --git a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
index 88ea941b15..0450d74aff 100644
--- a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
+++ b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/message"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="${fragmentClass}"
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index 3c77c70408..a6a0e28058 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/sas_emoji_index"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="32dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/sas_emoji"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/sas_emoji_text"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/sas_emoji_text_id"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 3c4e233c7c..d6aa0a1943 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -231,7 +231,7 @@ class PopupAlertManager @Inject constructor() {
                         setIcon(it)
                     }
                     alert.actions.forEach { action ->
-                        addButton(action.title, R.style.Button_Vector_Style_Text_Alerter) {
+                        addButton(action.title, R.style.Widget_Vector_Button_Text_Alerter) {
                             if (action.autoClose) {
                                 currentIsDismissed()
                                 Alerter.hide()
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 46f3347391..f9e290f29e 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/bug_report_progress_text_view"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -64,7 +64,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_first_text"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -93,7 +93,7 @@
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -103,7 +103,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_logs_description"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index cb8b2f3b7c..0df28cf16a 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -98,7 +98,7 @@
 
     <TextView
         android:id="@+id/participantNameText"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -114,7 +114,7 @@
 
     <TextView
         android:id="@+id/callStatusText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -130,7 +130,7 @@
 
     <Button
         android:id="@+id/callActionText"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_margin="8dp"
diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml
index bd4b7bcfca..046c8ce569 100644
--- a/vector/src/main/res/layout/activity_call_transfer.xml
+++ b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -60,7 +60,7 @@
 
             <TextView
                 android:id="@+id/callTransferConsultTitle"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -72,7 +72,7 @@
 
             <Button
                 android:id="@+id/callTransferConnectAction"
-                style="@style/Button.Vector.Style.Text"
+                style="@style/Widget.Vector.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml
index 1cb6cf47a2..afbd6fa90f 100644
--- a/vector/src/main/res/layout/activity_signed_out.xml
+++ b/vector/src/main/res/layout/activity_signed_out.xml
@@ -17,14 +17,14 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/signed_out_title"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <Button
                 android:id="@+id/signedOutSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index a6a722e576..b24ea8a322 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -15,10 +15,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <!-- Use Toolbar.Vector.Settings on this screen for better alignment with setting items -->
+            <!-- Use Widget.Vector.Toolbar.Settings on this screen for better alignment with setting items -->
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/settingsToolbar"
-                style="@style/Toolbar.Vector.Settings"
+                style="@style/Widget.Vector.Toolbar.Settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:navigationIcon="@drawable/ic_back_24dp"
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index c29a08c690..781441ef1f 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/incomingCallNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/incomingCallKindView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index ed47759c83..482dc738cb 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -44,7 +44,7 @@
 
         <TextView
             android:id="@+id/tvTitle"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
@@ -58,7 +58,7 @@
 
         <TextView
             android:id="@+id/tvText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index ce674c1497..52784bc6af 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -31,7 +31,7 @@
 
         <TextView
             android:id="@+id/bootstrapTitleText"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
index 48b3df89b7..f72fb34bc5 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
@@ -16,7 +16,7 @@
 
         <TextView
             android:id="@+id/callDialPadTitle"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
index 491fdeda3a..065ba48220 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bottomSheetTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index 8660eb4bb5..6dbf4d91ee 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/inviterText"
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -49,7 +49,7 @@
 
             <TextView
                 android:id="@+id/inviterMxid"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index 139c469cfb..abda9dfc7c 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -11,7 +11,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_signout_warning_text"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/backupStatusText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 065d1d2a36..3195877b5b 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -11,7 +11,7 @@
 
 
     <TextView
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/widgetPermissionHeader2"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -57,7 +57,7 @@
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerDisplayName"
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
@@ -67,7 +67,7 @@
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerId"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
@@ -80,7 +80,7 @@
 
     <TextView
         android:id="@+id/widgetPermissionSharedInfo"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -99,7 +99,7 @@
 
         <Button
             android:id="@+id/widgetPermissionDecline"
-            style="@style/Button.Vector.Style.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
@@ -108,7 +108,7 @@
 
         <Button
             android:id="@+id/widgetPermissionContinue"
-            style="@style/Button.Vector.Style.Positive"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 59d2632d59..5757adea6a 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -10,7 +10,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/keys_backup_setup_step3_copy_button_title"
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/keys_backup_recovery_key_text"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -52,7 +52,7 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -85,7 +85,7 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index a1109734f9..03893a45f9 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/headerText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/descriptionText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
@@ -63,7 +63,7 @@
 
     <!--    <Button-->
     <!--        android:id="@+id/skipButton"-->
-    <!--        style="@style/Button.Vector.Style.Outlined"-->
+    <!--        style="@style/Widget.Vector.Button.Outlined"-->
     <!--        android:layout_width="match_parent"-->
     <!--        android:layout_height="wrap_content"-->
     <!--        android:layout_marginTop="@dimen/layout_vertical_margin"-->
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index b4138a1963..d263180521 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/headerText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 6829e7924f..2975df65d5 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/spaceNameView"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -56,7 +56,7 @@
 
         <TextView
             android:id="@+id/spaceDescription"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 676367edd5..a6c6ded739 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/otherUserNameText"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index 4a78b34ec2..030834809d 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -104,7 +104,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/EditText.Vector.Composer"
+        style="@style/Widget.Vector.EditText.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index a17c9689f0..fe7cdf43d8 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -135,7 +135,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/EditText.Vector.Composer"
+        style="@style/Widget.Vector.EditText.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/room_message_placeholder_not_encrypted"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 7a0790788d..1ef31900f7 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
@@ -68,7 +68,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageContent"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -147,7 +147,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/EditText.Vector.Composer"
+        style="@style/Widget.Vector.EditText.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index a3cd0ca372..bce8a2ef4e 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/cart_badge"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:background="@drawable/bg_unread_highlight"
diff --git a/vector/src/main/res/layout/dialog_background_sync_mode.xml b/vector/src/main/res/layout/dialog_background_sync_mode.xml
index b9ddd7db4d..e065c2d037 100644
--- a/vector/src/main/res/layout/dialog_background_sync_mode.xml
+++ b/vector/src/main/res/layout/dialog_background_sync_mode.xml
@@ -17,7 +17,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_battery"
@@ -25,7 +25,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -43,7 +43,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_real_time"
@@ -51,7 +51,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -69,7 +69,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_disabled"
@@ -77,7 +77,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
index 743243358c..421c723d3a 100644
--- a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
+++ b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/dialogConfirmationText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index 77e509ba54..bbf346c8dc 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -13,14 +13,14 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:text="@string/encryption_information_verify_device_warning" />
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -29,13 +29,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_name"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device name" />
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -44,13 +44,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_id"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device id" />
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -59,13 +59,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_key"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device key" />
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index 398694e9a5..38f376e7eb 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/disclaimerTextView"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/disclaimer_title"
@@ -52,7 +52,7 @@
         app:layout_constraintTop_toBottomOf="@id/disclaimerIconsLayout" />
 
     <TextView
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
index f41eaaf072..d3c52a61ed 100644
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ b/vector/src/main/res/layout/dialog_event_content.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/event_content_text_view"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
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 6b5b12f2a1..60797804c7 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/exportDialogText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/encryption_export_notice"
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 14f0c44bc0..cf877ae9cb 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/dialog_e2e_keys_passphrase_filename"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/dialog_no_sticker_pack.xml b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
index d1c205c920..27896c070b 100644
--- a/vector/src/main/res/layout/dialog_no_sticker_pack.xml
+++ b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/TextView.Vector.Body"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:drawablePadding="16dp"
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index d10ec2eff4..0497f0521c 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -14,7 +14,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index f4adc3c3c2..88336b5583 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
-                style="@style/TextView.Vector.HeadlineMedium"
+                style="@style/Widget.Vector.TextView.HeadlineMedium"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/keepItSafeText"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
index 62891c6ad7..584db222c0 100644
--- a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
+++ b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
@@ -13,7 +13,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/ssl_explanation"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -29,7 +29,7 @@
 
         <TextView
             android:id="@+id/ssl_user_id"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint_title"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -45,14 +45,14 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="12dp"
             tools:text="07 89 7A A0 30 82 99 95 E6 17 5D 1F 34 5D 8D 0C 67 82 63 1C 1F 57 20 75 42 91 F7 8B 28 03 54 A2" />
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
index e1af418712..e8d53f3ad5 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/bootstrapConclusionText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index 389ab1ff09..cda5582fdd 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -58,7 +58,7 @@
 
     <Button
         android:id="@+id/bootstrapPasswordButton"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index e7676feb05..92b3c48860 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/bootstrapWarningInfo"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -76,7 +76,7 @@
 
     <Button
         android:id="@+id/bootstrapSubmit"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/_continue"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index bc79350162..e7650ff92d 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -41,7 +41,7 @@
 
         <Button
             android:id="@+id/bootstrapMigrateUseFile"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/use_file"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/bootstrapMigrateForgotPassphrase"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/bootstrapMigrateContinueButton"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index 43e3c7bfe3..bb527db292 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/reAuthFailureText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -40,7 +40,7 @@
 
     <Button
         android:id="@+id/bootstrapCancelButton"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -49,7 +49,7 @@
 
     <Button
         android:id="@+id/bootstrapRetryButton"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index a173abe69f..d7c26a316a 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapSaveText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/bootstrapRecoveryKeyText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index ab697048b3..32bee53581 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapSetupSecureText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/bootstrapSetupWarningTextView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index b78c3901cf..ee411a94d6 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/bootstrapLoadingStatusText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index b32ad45703..9c704f3a42 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/phoneBookTitle"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -92,7 +92,7 @@
 
             <Button
                 android:id="@+id/phoneBookSearchForMatrixContacts"
-                style="@style/Button.Vector.Style.Text"
+                style="@style/Widget.Vector.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 6d974793c5..130186deed 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/createDirectRoomTitle"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index 4eba062c80..a41256711e 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -40,7 +40,7 @@
 
                     <TextView
                         android:id="@+id/createRoomTitle"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index 36d7036fd2..458d338986 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/deactivateAccountContent"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/deactivate_account_content"
@@ -33,7 +33,7 @@
 
         <Button
             android:id="@+id/deactivateAccountSubmit"
-            style="@style/Button.Vector.Style.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index dcca8fab50..07e879e2ca 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -46,7 +46,7 @@
 
                     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
                         android:id="@+id/drawerUnreadCounterBadgeView"
-                        style="@style/TextView.Vector.Micro"
+                        style="@style/Widget.Vector.TextView.Micro"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
@@ -77,7 +77,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarTitleView"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
@@ -89,7 +89,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarSpaceTitleView"
-                        style="@style/TextView.Vector.Subtitle"
+                        style="@style/Widget.Vector.TextView.Subtitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 9e9410d3d7..c8cde46247 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/homeDrawerUsernameView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
         <TextView
             android:id="@+id/homeDrawerUserIdView"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -78,7 +78,7 @@
 
         <Button
             android:id="@+id/homeDrawerInviteFriendButton"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginTop="8dp"
@@ -131,7 +131,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSettingsView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
@@ -150,7 +150,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSignoutView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index 60533b365c..db4393dccc 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/keys_restore_with_key"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -77,7 +77,7 @@
 
         <TextView
             android:id="@+id/keys_restore_key_help_with_link"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index bdf92a402d..209f71dbec 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/keys_backup_restore_with_passphrase"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -74,7 +74,7 @@
 
         <TextView
             android:id="@+id/helperTextWithLink"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index 34f2d36ac5..fc69167bc0 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/success_text"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/success_details_text"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index c0e1882382..bcc1de7d6a 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_title"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -39,7 +39,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_description"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -66,7 +66,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_advanced_option_text"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -83,7 +83,7 @@
 
     <Button
         android:id="@+id/keys_backup_setup_step1_manual_export_button"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_margin="16dp"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index 0ee222acac..b3301e8deb 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_title"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_description"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -120,7 +120,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_recovery_key_alternative"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -133,7 +133,7 @@
 
         <Button
             android:id="@+id/keys_backup_setup_step2_skip_button"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index d4c29702cb..63fe41b36a 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -43,7 +43,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_line1_text"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -55,7 +55,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_label2"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -68,7 +68,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_recovery_key_text"
-            style="@style/TextView.Vector.Title"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_horizontal_margin"
@@ -82,7 +82,7 @@
 
         <Button
             android:id="@+id/keys_backup_setup_step3_copy_button"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 7177bd2543..f48e989d42 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -35,7 +35,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -101,7 +101,7 @@
 
             <TextView
                 android:id="@+id/loginPasswordNotice"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -117,7 +117,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Button.Vector.Style.Login.Text"
+                    style="@style/Widget.Vector.Button.Text.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -125,7 +125,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Button.Vector.Style.Login"
+                    style="@style/Widget.Vector.Button.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -147,7 +147,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 50a78b8881..0ec4881544 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -25,7 +25,7 @@
 
             <TextView
                 android:id="@+id/loginAccountCreatedSubtitle"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -33,7 +33,7 @@
                 tools:text="@string/login_account_created_subtitle" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -41,7 +41,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -67,7 +67,7 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedMemberName"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -84,7 +84,7 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedTime"
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -96,7 +96,7 @@
                     tools:text="@tools:sample/date/hhmm" />
 
                 <TextView
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/login_account_created_message"
@@ -108,7 +108,7 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -122,7 +122,7 @@
 
                 <Button
                     android:id="@+id/loginAccountCreatedLater"
-                    style="@style/Button.Vector.Style.Login.Text"
+                    style="@style/Widget.Vector.Button.Text.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -130,7 +130,7 @@
 
                 <Button
                     android:id="@+id/loginAccountCreatedDone"
-                    style="@style/Button.Vector.Style.Login"
+                    style="@style/Widget.Vector.Button.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index 66709d9517..655bd98097 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -22,7 +22,7 @@
 
         <TextView
             android:id="@+id/loginCaptchaNotice"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index 1dfda244f1..0412c4e0cb 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="?vctr_content_primary"
@@ -25,7 +25,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -70,7 +70,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Button.Vector.Style.Login.Text"
+                    style="@style/Widget.Vector.Button.Text.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -80,7 +80,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Button.Vector.Style.Login"
+                    style="@style/Widget.Vector.Button.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
index c5d49a520c..a5b65d62f5 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -37,7 +37,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormMandatoryNotice"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="26dp"
@@ -49,7 +49,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -82,7 +82,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Button.Vector.Style.Login.Text"
+                    style="@style/Widget.Vector.Button.Text.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -92,7 +92,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormLater"
-                    style="@style/Button.Vector.Style.Login.Text"
+                    style="@style/Widget.Vector.Button.Text.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -103,7 +103,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Button.Vector.Style.Login"
+                    style="@style/Widget.Vector.Button.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index c71909476f..4aee9e6548 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="?vctr_content_primary"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -89,7 +89,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
index bb4d39dab8..22365f50fe 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -51,7 +51,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -60,7 +60,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -109,7 +109,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
index 93be6d489c..8ae0a18b70 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_mail_confirmation_title"
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -30,7 +30,7 @@
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -39,7 +39,7 @@
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
index 0d33880a18..fa3aa74285 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -23,7 +23,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -31,7 +31,7 @@
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -40,7 +40,7 @@
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success.xml b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
index 2fc0d08d21..8fae21740b 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_success_title"
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -30,7 +30,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -39,7 +39,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
index f07db563d6..d0e7a447cc 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -23,7 +23,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -31,7 +31,7 @@
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -40,7 +40,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index ce4a968e4e..a7b065c29d 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -19,7 +19,7 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
@@ -32,7 +32,7 @@
 
             <TextView
                 android:id="@+id/loginServerText"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -73,7 +73,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -116,7 +116,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsText"
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
@@ -130,7 +130,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsLearnMore"
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
@@ -158,7 +158,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
@@ -171,7 +171,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
@@ -187,7 +187,7 @@
 
             <Button
                 android:id="@+id/loginServerIKnowMyIdSubmit"
-                style="@style/Button.Vector.Style.Login.Text"
+                style="@style/Widget.Vector.Button.Text.Login"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index 5842e2fe2f..6a7f2c43e0 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginServerText"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -61,7 +61,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -77,7 +77,7 @@
 
             <TextView
                 android:id="@+id/loginServerText2"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
@@ -98,7 +98,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
@@ -111,7 +111,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/TextView.Vector.Caption"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
@@ -127,7 +127,7 @@
 
             <TextView
                 android:id="@+id/loginServerChoiceEmsLearnMore"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index cac3fe9ee0..0a5c10935a 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -27,7 +27,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormText"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -46,7 +46,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormLearnMore"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -75,7 +75,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -86,7 +86,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormNotice"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
@@ -96,7 +96,7 @@
 
             <Button
                 android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
index 0b4f50faf0..6038cfaedd 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -46,7 +46,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -60,7 +60,7 @@
 
             <Button
                 android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
index 15d50c8d4c..4f8ed3be4e 100644
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/loginWelcomeBack"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -43,7 +43,7 @@
 
             <TextView
                 android:id="@+id/loginWelcomeBackWarning"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -98,7 +98,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Button.Vector.Style.Login.Text"
+                    style="@style/Widget.Vector.Button.Text.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -108,7 +108,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Button.Vector.Style.Login"
+                    style="@style/Widget.Vector.Button.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
index c96c149e4a..0e5f4bcbb7 100644
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -87,7 +87,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Button.Vector.Style.Login.Text"
+                    style="@style/Widget.Vector.Button.Text.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -97,7 +97,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Button.Vector.Style.Login"
+                    style="@style/Widget.Vector.Button.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -119,7 +119,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
index ac6408b439..acba8dd7e1 100644
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginSubtitle"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -52,7 +52,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -61,7 +61,7 @@
 
             <TextView
                 android:id="@+id/loginServerText3"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -71,7 +71,7 @@
 
             <Button
                 android:id="@+id/loginChooseAServer"
-                style="@style/Button.Vector.Style.Login.Text"
+                style="@style/Widget.Vector.Button.Text.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
index 407c1e6682..30d4460ed3 100644
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -33,7 +33,7 @@
 
             <TextView
                 android:id="@+id/loginMatrixIdentifier"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -41,7 +41,7 @@
                 tools:text="\@user:domain.org" />
 
             <TextView
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -50,7 +50,7 @@
                 android:textStyle="italic" />
 
             <TextView
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -99,7 +99,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index 0521242468..eb3b1b703c 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -33,7 +33,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -45,7 +45,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninText"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -59,7 +59,7 @@
             <!-- Sign up or sign in SSO -->
             <Button
                 android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="38dp"
@@ -71,7 +71,7 @@
             <!-- Sign in or gone -->
             <Button
                 android:id="@+id/loginSignupSigninSignIn"
-                style="@style/Button.Vector.Style.Login.Outlined"
+                style="@style/Widget.Vector.Button.Outlined.Login"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="14dp"
@@ -99,7 +99,7 @@
 
                 <TextView
                     android:id="@+id/loginSignupSigninSocialLoginHeader"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="27dp"
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
index 770693c075..6eeff13d86 100644
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginSubtitle"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -52,7 +52,7 @@
 
             <TextView
                 android:id="@+id/loginChooseHelp"
-                style="@style/TextView.Vector.Caption"
+                style="@style/Widget.Vector.TextView.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/login_please_choose_a_user_name_help_2"
@@ -61,7 +61,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -82,7 +82,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index de39fa3f4c..1d69cde723 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -105,7 +105,7 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -130,7 +130,7 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -155,7 +155,7 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -179,7 +179,7 @@
 
     <Button
         android:id="@+id/loginSplashSubmit"
-        style="@style/Button.Vector.Style.Login"
+        style="@style/Widget.Vector.Button.Login"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/login_splash_submit"
@@ -199,7 +199,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
index 75d4663336..08d3d3b6a4 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -105,7 +105,7 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -130,7 +130,7 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -155,7 +155,7 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -189,7 +189,7 @@
 
         <Button
             android:id="@+id/loginSignupSigninSignUp"
-            style="@style/Button.Vector.Style.Login"
+            style="@style/Widget.Vector.Button.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -197,7 +197,7 @@
 
         <Button
             android:id="@+id/loginSignupSigninSignIn"
-            style="@style/Button.Vector.Style.Login.Text"
+            style="@style/Widget.Vector.Button.Text.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -216,7 +216,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
index 18a6ad618e..baa05ee30f 100644
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
@@ -15,7 +15,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -25,7 +25,7 @@
 
             <Button
                 android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Button.Vector.Style.Login"
+                style="@style/Widget.Vector.Button.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index 7f37765a54..5a52f4d15d 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -20,7 +20,7 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/TextView.Vector.Title"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -54,7 +54,7 @@
 
         <Button
             android:id="@+id/loginTermsSubmit"
-            style="@style/Button.Vector.Style.Login"
+            style="@style/Widget.Vector.Button.Login"
             android:layout_marginEnd="36dp"
             android:text="@string/accept"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index 69e3ff2271..5cf4d5e415 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/TextView.Vector.Title"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="36dp"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -58,7 +58,7 @@
 
         <Button
             android:id="@+id/loginTermsSubmit"
-            style="@style/Button.Vector.Style.Login"
+            style="@style/Widget.Vector.Button.Login"
             android:layout_marginEnd="36dp"
             android:text="@string/accept"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email.xml b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
index 8fa747ff51..9b165c96f4 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_wait_for_email_title"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index f227a1f312..15046afb61 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -15,7 +15,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
-                style="@style/TextView.Vector.Title"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
-                style="@style/TextView.Vector.Subtitle"
+                style="@style/Widget.Vector.TextView.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailHelp"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -43,7 +43,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <ProgressBar
-                style="@style/ProgressBar.Vector.Horizontal"
+                style="@style/Widget.Vector.ProgressBar.Horizontal"
                 android:layout_width="240dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 4e1e49ede3..4fb1328abc 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -71,7 +71,7 @@
 
                     <TextView
                         android:id="@+id/matrixProfileToolbarTitleView"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 43a25b05a1..cdbf53b8f9 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -42,7 +42,7 @@
 
         <TextView
             android:id="@+id/matrixToCardNameText"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -56,7 +56,7 @@
 
         <TextView
             android:id="@+id/matrixToCardAliasText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -87,7 +87,7 @@
 
         <TextView
             android:id="@+id/matrixToAccessText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -133,7 +133,7 @@
 
             <TextView
                 android:id="@+id/spaceChildMemberCountText"
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -144,7 +144,7 @@
 
         <TextView
             android:id="@+id/matrixToCardDescText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -214,7 +214,7 @@
         <!-- layout_goneMarginStart: add half the width of the avatar: 15dp -->
         <TextView
             android:id="@+id/peopleYouMayKnowText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -254,7 +254,7 @@
 
         <!--        <Button-->
         <!--            android:id="@+id/matrixToCardSecondaryButton"-->
-        <!--            style="@style/Button.Vector.Style.Outlined"-->
+        <!--            style="@style/Widget.Vector.Button.Outlined"-->
         <!--            android:layout_width="0dp"-->
         <!--            android:layout_height="wrap_content"-->
         <!--            android:layout_marginTop="8dp"-->
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index b99cfb1172..fbe504a2d6 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/matrixToCardNameText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/matrixToCardUserIdText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index b81a962b93..a16d45591c 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -36,7 +36,7 @@
 
         <Button
             android:id="@+id/publicRoomsCreateNewRoom"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index 1aeb61e9bf..374346c2b2 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/reAuthConfirmText"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -70,7 +70,7 @@
         <!--            android:layout_height="wrap_content"-->
         <!--            android:gravity="start"-->
         <!--            android:text="@string/login_signin_matrix_id_password_notice"-->
-        <!--            style="@style/TextView.Vector.Caption"-->
+        <!--            style="@style/Widget.Vector.TextView.Caption"-->
         <!--            android:visibility="gone"-->
         <!--            app:layout_constraintEnd_toEndOf="parent"-->
         <!--            app:layout_constraintStart_toStartOf="parent"-->
@@ -79,7 +79,7 @@
 
         <TextView
             android:id="@+id/genericErrorText"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="start"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index a6d807d873..b685044e84 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -37,7 +37,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/TextView.Vector.HeadlineMedium"
+                    style="@style/Widget.Vector.TextView.HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -50,7 +50,7 @@
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_review_terms.xml b/vector/src/main/res/layout/fragment_review_terms.xml
index 57d177d7b8..58c13262e7 100644
--- a/vector/src/main/res/layout/fragment_review_terms.xml
+++ b/vector/src/main/res/layout/fragment_review_terms.xml
@@ -30,7 +30,7 @@
 
         <Button
             android:id="@+id/reviewTermsDecline"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 316f406ef1..19d85d5393 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineMedium"
+                    style="@style/Widget.Vector.TextView.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -63,7 +63,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarSubtitleView"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 4ae28b1f77..acbd5a1f4f 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -60,7 +60,7 @@
 
             <ProgressBar
                 android:id="@+id/roomPreviewPeekingProgress"
-                style="@style/ProgressBar.Vector.Horizontal"
+                style="@style/Widget.Vector.ProgressBar.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
@@ -90,7 +90,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewName"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="56dp"
@@ -101,7 +101,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewTopic"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -112,7 +112,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewLabel"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -122,7 +122,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewError"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index b023ddfb7e..7d63c140f3 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/roomSettingsToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineMedium"
+                    style="@style/Widget.Vector.TextView.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index b8874218ab..9d4155229f 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomUploadsToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineMedium"
+                    style="@style/Widget.Vector.TextView.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_widget.xml b/vector/src/main/res/layout/fragment_room_widget.xml
index 94fb3bb992..7c464caf4c 100644
--- a/vector/src/main/res/layout/fragment_room_widget.xml
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -40,7 +40,7 @@
 
         <TextView
             android:id="@+id/widgetErrorText"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_set_identity_server.xml b/vector/src/main/res/layout/fragment_set_identity_server.xml
index 446b617771..2f3444b451 100644
--- a/vector/src/main/res/layout/fragment_set_identity_server.xml
+++ b/vector/src/main/res/layout/fragment_set_identity_server.xml
@@ -14,7 +14,7 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultNotice"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -24,7 +24,7 @@
 
         <Button
             android:id="@+id/identityServerSetDefaultSubmit"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultAlternative"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -64,7 +64,7 @@
 
         <Button
             android:id="@+id/identityServerSetDefaultAlternativeSubmit"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
index bf8324a821..1eab008910 100644
--- a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
+++ b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/troubleshoot_summ_title"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -42,7 +42,7 @@
 
         <TextView
             android:id="@+id/toubleshoot_summ_description"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index aa97382f49..f2150cb390 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -35,7 +35,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/TextView.Vector.HeadlineMedium"
+                    style="@style/Widget.Vector.TextView.HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -76,7 +76,7 @@
 
         <Button
             android:id="@+id/createNewRoom"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index c1dc2e313d..e1e555eace 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,7 +13,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -24,7 +24,7 @@
 
         <TextView
             android:id="@+id/accessInfoHelpText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index fc47dafae9..b675ec9b30 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -21,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            style="@style/TextView.Vector.Title"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -35,7 +35,7 @@
 
         <TextView
             android:id="@+id/joinInfoHelpText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
@@ -72,7 +72,7 @@
 
         <TextView
             android:id="@+id/changeLaterText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 352b595762..e5c0a933d7 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -41,7 +41,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -62,7 +62,7 @@
 
             <ProgressBar
                 android:id="@+id/spacePreviewPeekingProgress"
-                style="@style/ProgressBar.Vector.Horizontal"
+                style="@style/Widget.Vector.ProgressBar.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
@@ -101,7 +101,7 @@
 
             <Button
                 android:id="@+id/spacePreviewDeclineInviteButton"
-                style="@style/Button.Vector.Style.Destructive"
+                style="@style/Widget.Vector.Button.Destructive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -110,7 +110,7 @@
 
             <Button
                 android:id="@+id/spacePreviewAcceptInviteButton"
-                style="@style/Button.Vector.Style.Positive"
+                style="@style/Widget.Vector.Button.Positive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index 5ed6f458b2..0b015f65f9 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key_text"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -81,7 +81,7 @@
 
         <Button
             android:id="@+id/ssss_key_use_file"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/use_file"
@@ -90,7 +90,7 @@
 
         <Button
             android:id="@+id/ssss_key_submit"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/_continue"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index df0a252240..3e008fe415 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase_warning_text"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -88,7 +88,7 @@
 
         <Button
             android:id="@+id/ssss_passphrase_submit"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
@@ -98,7 +98,7 @@
 
         <TextView
             android:id="@+id/ssss_passphrase_or"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -110,7 +110,7 @@
 
         <Button
             android:id="@+id/ssss_passphrase_use_key"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index 2b69b5f522..e46517e20b 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/reset_title"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_all_description"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_other_devices"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:layout_marginStart="16dp"
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_text3"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_text4"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -89,7 +89,7 @@
 
         <Button
             android:id="@+id/ssss_reset_button_cancel"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cancel"
@@ -97,7 +97,7 @@
 
         <Button
             android:id="@+id/ssss_reset_button_reset"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/reset"
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 48163f80f2..8cf5753993 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/showUserCodeTitle"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -104,7 +104,7 @@
 
                 <TextView
                     android:id="@+id/showUserCodeCardNameText"
-                    style="@style/TextView.Vector.Subtitle"
+                    style="@style/Widget.Vector.TextView.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -118,7 +118,7 @@
 
                 <TextView
                     android:id="@+id/showUserCodeCardUserIdText"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -158,7 +158,7 @@
 
         <TextView
             android:id="@+id/showUserCodeInfoText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -189,7 +189,7 @@
 
         <Button
             android:id="@+id/showUserCodeScanButton"
-            style="@style/Button.Vector.Style.Text"
+            style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 1a7159ded4..1fced84471 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/userDirectoryTitle"
-                        style="@style/TextView.Vector.HeadlineMedium"
+                        style="@style/Widget.Vector.TextView.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 5e4d2f3e10..96cad5b7e9 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -38,7 +38,7 @@
 
                 <TextView
                     android:id="@+id/userListTitle"
-                    style="@style/TextView.Vector.HeadlineMedium"
+                    style="@style/Widget.Vector.TextView.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -111,7 +111,7 @@
 
     <TextView
         android:id="@+id/userListE2EbyDefaultDisabled"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index 81e8f6de85..f58790deec 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/section_header_textview"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index d8500256ba..1da92a5796 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/commandName"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/commandParameter"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/commandDescription"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/commandName"
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index fb49eeb955..5ba4faa698 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/itemAutocompleteEmoji"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiName"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiSubname"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 68fb680b22..6f4a4e176e 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/matrixItemAutocompleteName"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/matrixItemAutocompleteSubname"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_autocomplete_more_result.xml b/vector/src/main/res/layout/item_autocomplete_more_result.xml
index 4b631065c5..23addf5fe4 100644
--- a/vector/src/main/res/layout/item_autocomplete_more_result.xml
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TextView.Vector.Caption"
+    style="@style/Widget.Vector.TextView.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index e396cefd91..483700c41f 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -53,7 +53,7 @@
 
         <TextView
             android:id="@+id/actionTitle"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 23a76e75ee..3e2c775643 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_timestamp"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
@@ -67,7 +67,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -86,7 +86,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body_details"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index c692bda984..41a46f58a3 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/messageStatusText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index 89db894631..db243184e5 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/quickReaction0"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/quickReaction1"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/quickReaction2"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/quickReaction3"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/quickReaction4"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/quickReaction5"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -63,7 +63,7 @@
 
     <TextView
         android:id="@+id/quickReaction6"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -72,7 +72,7 @@
 
     <TextView
         android:id="@+id/quickReaction7"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
index bba469b056..960f7be91c 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_radio.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/actionTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/actionDescription"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index abeae9b8d1..20899f8075 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -27,7 +27,7 @@
 
     <TextView
         android:id="@+id/bottomSheetRoomPreviewName"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index d5035fda4e..4e5b4813f3 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleTitle"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleSubtitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index 858e0131b2..ef7b7a4faf 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -38,7 +38,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/breadcrumbsUnreadCounterBadgeView"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -56,7 +56,7 @@
 
     <TextView
         android:id="@+id/breadcrumbsTypingView"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:background="@drawable/circle"
diff --git a/vector/src/main/res/layout/item_completion_homeserver.xml b/vector/src/main/res/layout/item_completion_homeserver.xml
index f66608bf0f..d0cb9f74df 100644
--- a/vector/src/main/res/layout/item_completion_homeserver.xml
+++ b/vector/src/main/res/layout/item_completion_homeserver.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
-    style="@style/TextView.Vector.Body"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index f1266e9892..f4e5aad33b 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/actionTitleText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 954c20afc3..b98adec5e6 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/contactDetailName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/contactDetailMatrixId"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index c6563e71d2..6df60344fe 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/contactDisplayName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 6cfdbcd493..18e9d1d3ec 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -59,7 +59,7 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserID"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 5bbb21241e..38df3ee0f7 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -18,7 +18,7 @@
         <!-- In compact mode only this is shown-->
         <TextView
             android:id="@+id/itemDeviceSimpleSummary"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
@@ -31,7 +31,7 @@
         -->
         <TextView
             android:id="@+id/itemDeviceDisplayNameLabel"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -40,7 +40,7 @@
 
         <TextView
             android:id="@+id/itemDeviceDisplayName"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/itemDeviceIdLabel"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -57,7 +57,7 @@
 
         <TextView
             android:id="@+id/itemDeviceId"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
@@ -67,7 +67,7 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeenLabel"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeen"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index 2425980fec..26f85d8c97 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -13,7 +13,7 @@
 
     <TextView
         android:id="@+id/item_emoji_tv"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -29,7 +29,7 @@
 
         <TextView
             android:id="@+id/item_emoji_name"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/item_emoji_keyword"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="2"
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index b0c213b1a1..0ef46c56a6 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -10,7 +10,7 @@
     <!-- size in dp, because we do not want the display to be impacted by font size setting -->
     <TextView
         android:id="@+id/item_emoji_tv"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/item_emoji_name_tv"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_error_retry.xml b/vector/src/main/res/layout/item_error_retry.xml
index d104712163..9648ffc5ef 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemErrorRetryText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?colorError"
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 18f3260fdd..65a04af425 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -9,7 +9,7 @@
 
     <im.vector.app.core.ui.views.NonScrollingTextView
         android:id="@+id/expandableContent"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:autoLink="web"
diff --git a/vector/src/main/res/layout/item_form_advanced_toggle.xml b/vector/src/main/res/layout/item_form_advanced_toggle.xml
index 47f1917e9f..00834f054b 100644
--- a/vector/src/main/res/layout/item_form_advanced_toggle.xml
+++ b/vector/src/main/res/layout/item_form_advanced_toggle.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/itemFormAdvancedToggleTitleView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 1823d21c46..93c14acbac 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/formSwitchTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/formSwitchSummary"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_generic_button.xml b/vector/src/main/res/layout/item_generic_button.xml
index d4139bfa0c..d56b53c03c 100644
--- a/vector/src/main/res/layout/item_generic_button.xml
+++ b/vector/src/main/res/layout/item_generic_button.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/itemGenericItemButton"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAllCaps="false"
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index a23f1953d6..932f5666c6 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/emptyItemTitleView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/emptyItemMessageView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_generic_footer.xml b/vector/src/main/res/layout/item_generic_footer.xml
index 209c18b7bf..4152cb1371 100644
--- a/vector/src/main/res/layout/item_generic_footer.xml
+++ b/vector/src/main/res/layout/item_generic_footer.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/itemGenericFooterText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 4f5655fd85..8ab2c21ec7 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemGenericHeaderText"
-    style="@style/TextView.Vector.Subtitle"
+    style="@style/Widget.Vector.TextView.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index edef6b0696..a23d4e30a7 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/item_generic_title_text"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/item_generic_description_text"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -115,7 +115,7 @@
 
     <Button
         android:id="@+id/item_generic_destructive_action_button"
-        style="@style/Button.Vector.Style.Destructive"
+        style="@style/Widget.Vector.Button.Destructive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_generic_pill_footer.xml b/vector/src/main/res/layout/item_generic_pill_footer.xml
index 1f7f54b572..ba883ebf68 100644
--- a/vector/src/main/res/layout/item_generic_pill_footer.xml
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -20,7 +20,7 @@
 
     <TextView
         android:id="@+id/itemGenericPillText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index 7304fee85f..feb5ca788e 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/itemGenericWithValueLabelText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/itemGenericWithValueValueText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 605a352de4..bc17752cbc 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index 9af8a09e7d..bde4f0a4ce 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemHelpText"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
diff --git a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
index cece6e34ca..0faacd3b49 100644
--- a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
+++ b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
@@ -18,7 +18,7 @@
 
     <Button
         android:id="@+id/keys_backup_settings_footer_button2"
-        style="@style/Button.Vector.Style"
+        style="@style/Widget.Vector.Button"
         android:layout_width="@dimen/button_max_width"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 99c9bf25f1..48b180de5f 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/knownUserName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -58,7 +58,7 @@
 
     <TextView
         android:id="@+id/knownUserID"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/item_loading.xml b/vector/src/main/res/layout/item_loading.xml
index c23965f831..95af47f548 100644
--- a/vector/src/main/res/layout/item_loading.xml
+++ b/vector/src/main/res/layout/item_loading.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/loadingText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index a8bfceca3b..c6c7bfa09d 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/localeTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/localeSubtitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_login_centered_button.xml b/vector/src/main/res/layout/item_login_centered_button.xml
index d13242070d..f73b914df2 100644
--- a/vector/src/main/res/layout/item_login_centered_button.xml
+++ b/vector/src/main/res/layout/item_login_centered_button.xml
@@ -6,7 +6,7 @@
 
     <Button
         android:id="@+id/itemLoginCenteredButton"
-        style="@style/Button.Vector.Style.Login"
+        style="@style/Widget.Vector.Button.Login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_error_retry.xml b/vector/src/main/res/layout/item_login_error_retry.xml
index 4465b5320d..0f0e5a1556 100644
--- a/vector/src/main/res/layout/item_login_error_retry.xml
+++ b/vector/src/main/res/layout/item_login_error_retry.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/itemLoginErrorRetryText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index b94c40abd4..6f1f03b97b 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -53,7 +53,7 @@
 
         <Button
             android:id="@+id/itemLoginPasswordFormForgetPasswordButton"
-            style="@style/Button.Vector.Style.Login.Text"
+            style="@style/Widget.Vector.Button.Text.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
@@ -63,7 +63,7 @@
 
         <Button
             android:id="@+id/itemLoginPasswordFormSubmit"
-            style="@style/Button.Vector.Style.Login"
+            style="@style/Widget.Vector.Button.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/item_login_red_button.xml b/vector/src/main/res/layout/item_login_red_button.xml
index b7468d1d22..f911be5102 100644
--- a/vector/src/main/res/layout/item_login_red_button.xml
+++ b/vector/src/main/res/layout/item_login_red_button.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/itemLoginRedButton"
-        style="@style/Button.Vector.Style.Login"
+        style="@style/Widget.Vector.Button.Login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_login_text.xml b/vector/src/main/res/layout/item_login_text.xml
index 5b30612923..51b47f3721 100644
--- a/vector/src/main/res/layout/item_login_text.xml
+++ b/vector/src/main/res/layout/item_login_text.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginText"
-    style="@style/TextView.Vector.Body"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index 5af6bb4896..165fc83d7b 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_title.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginTitleText"
-    style="@style/TextView.Vector.Title"
+    style="@style/Widget.Vector.TextView.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index 3009e5720c..342237cdde 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLoginTitleSmallText"
-    style="@style/TextView.Vector.Subtitle"
+    style="@style/Widget.Vector.TextView.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_no_result.xml b/vector/src/main/res/layout/item_no_result.xml
index aefdef7a5a..a46bd1b2f1 100644
--- a/vector/src/main/res/layout/item_no_result.xml
+++ b/vector/src/main/res/layout/item_no_result.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/itemNoResultText"
-    style="@style/TextView.Vector.Body"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index 4d6336812f..1ec347f685 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/troubleshootTestTitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/troubleshootTestDescription"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index f32ce66607..a22211711f 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_title"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_subtitle"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_positive_button.xml b/vector/src/main/res/layout/item_positive_button.xml
index c15e4900ee..05fd70f523 100644
--- a/vector/src/main/res/layout/item_positive_button.xml
+++ b/vector/src/main/res/layout/item_positive_button.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/itemGenericItemButton"
-        style="@style/Button.Vector.Style.Positive"
+        style="@style/Widget.Vector.Button.Positive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index ca87e69dad..72ef166d02 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/actionTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -50,7 +50,7 @@
 
     <TextView
         android:id="@+id/actionSubtitle"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 7c68afe454..51818250cd 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -73,7 +73,7 @@
 
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index b187dbd50b..4662cd9e58 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml
index ba6d40b79e..d32dbdc8e0 100644
--- a/vector/src/main/res/layout/item_profile_section.xml
+++ b/vector/src/main/res/layout/item_profile_section.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemProfileSectionView"
-    style="@style/TextView.Vector.Title"
+    style="@style/Widget.Vector.TextView.Title"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="?vctr_list_separator_system"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 30f3f99316..12aaf8a653 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomTopic"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomMembersCount"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -80,7 +80,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomAlias"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index 1ba229f211..28bcef1ee2 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKind"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppId"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppIdValue"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKey"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKeyValue"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -56,7 +56,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppName"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -66,7 +66,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppNameValue"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceName"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -85,7 +85,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceNameValue"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -95,7 +95,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURL"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -104,7 +104,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURLValue"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -113,7 +113,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormat"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -123,7 +123,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormatValue"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index b019f1913b..080e4f4835 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -16,7 +16,7 @@
 
         <TextView
             android:id="@+id/pushRuleId"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/pushRuleDescription"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index f2d078684c..11fe6c5b54 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -97,7 +97,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -135,7 +135,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -156,7 +156,7 @@
 
     <TextView
         android:id="@+id/roomLastEventTimeView"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -168,7 +168,7 @@
 
     <TextView
         android:id="@+id/roomLastEventView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
@@ -183,7 +183,7 @@
 
     <TextView
         android:id="@+id/roomTypingView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/item_room_alias_text_input.xml b/vector/src/main/res/layout/item_room_alias_text_input.xml
index c59cee112b..1cac4763c4 100644
--- a/vector/src/main/res/layout/item_room_alias_text_input.xml
+++ b/vector/src/main/res/layout/item_room_alias_text_input.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHash"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHomeServer"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index f4d2b47881..0fd1e96d4a 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/roomCategoryTitleView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -33,7 +33,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 12a24dc816..355f14cef3 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -27,7 +27,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryDescription"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index c0b3c72586..63c81c3aab 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerDescription"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index 86b355e0e8..8df6c53032 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical">
 
     <TextView
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -16,7 +16,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterCreateRoom"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -25,7 +25,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterCreateDirect"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -33,7 +33,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterOpenRoomDirectory"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index f2a6d653c3..e526b10c53 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -32,7 +32,7 @@
 
     <TextView
         android:id="@+id/roomInvitationNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index f2025fee4a..5b04d49d81 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index 484b321a35..1299fa4440 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/itemManageRoomSuggested"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index db31e5f2f6..e62be19333 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/messageTimeView"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
@@ -50,7 +50,7 @@
 
     <TextView
         android:id="@+id/messageContentView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_settings_button.xml b/vector/src/main/res/layout/item_settings_button.xml
index fc3ffe4588..1b3e173b9a 100644
--- a/vector/src/main/res/layout/item_settings_button.xml
+++ b/vector/src/main/res/layout/item_settings_button.xml
@@ -8,7 +8,7 @@
 
     <Button
         android:id="@+id/settings_item_button"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index d1722cc375..c6a8a220b9 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -13,7 +13,7 @@
 
     <TextView
         android:id="@+id/settings_item_text"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -29,7 +29,7 @@
 
     <Button
         android:id="@+id/settings_item_button"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_settings_continue_cancel.xml b/vector/src/main/res/layout/item_settings_continue_cancel.xml
index 6ad8f366b2..5ec5d90756 100644
--- a/vector/src/main/res/layout/item_settings_continue_cancel.xml
+++ b/vector/src/main/res/layout/item_settings_continue_cancel.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/settings_item_cancel_button"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/cancel"
@@ -19,7 +19,7 @@
 
     <Button
         android:id="@+id/settings_item_continue_button"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/_continue"
diff --git a/vector/src/main/res/layout/item_settings_edit_text.xml b/vector/src/main/res/layout/item_settings_edit_text.xml
index d240b6e072..61cc1e3695 100644
--- a/vector/src/main/res/layout/item_settings_edit_text.xml
+++ b/vector/src/main/res/layout/item_settings_edit_text.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/settings_item_edit_text_description"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
diff --git a/vector/src/main/res/layout/item_settings_helper_info.xml b/vector/src/main/res/layout/item_settings_helper_info.xml
index 9a73dca344..07901d2a87 100644
--- a/vector/src/main/res/layout/item_settings_helper_info.xml
+++ b/vector/src/main/res/layout/item_settings_helper_info.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_helper_text"
-    style="@style/TextView.Vector.Body"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_settings_information.xml b/vector/src/main/res/layout/item_settings_information.xml
index 3578990e98..9f4cb5742c 100644
--- a/vector/src/main/res/layout/item_settings_information.xml
+++ b/vector/src/main/res/layout/item_settings_information.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/settings_item_information"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
diff --git a/vector/src/main/res/layout/item_settings_section_title.xml b/vector/src/main/res/layout/item_settings_section_title.xml
index e888026e03..acef1ed325 100644
--- a/vector/src/main/res/layout/item_settings_section_title.xml
+++ b/vector/src/main/res/layout/item_settings_section_title.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_section_title_text"
-    style="@style/TextView.Vector.HeadlineMedium"
+    style="@style/Widget.Vector.TextView.HeadlineMedium"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?vctr_header_background"
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index 64d2af5004..b4e6e24b2f 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -18,7 +18,7 @@
 
         <TextView
             android:id="@+id/settings_item_title"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
@@ -28,7 +28,7 @@
 
         <TextView
             android:id="@+id/settings_item_description"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 581a0bdcc6..74ae731b0e 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/item_settings_three_pid_title"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 46c19259b9..6f473c209d 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoKey"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 4b04d9588d..147112ebb1 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -35,7 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -57,7 +57,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/groupDescView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index 445b28e8d4..538709dfbb 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 546a5c2b9c..4aec314c93 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -9,7 +9,7 @@
     android:paddingEnd="16dp">
 
     <TextView
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -19,7 +19,7 @@
         app:drawableEndCompat="@drawable/ic_beta_pill" />
 
     <TextView
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/spaceBetaFeedbackAction"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index 5921b0c307..e1d8b8edd6 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/childRoomName"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -61,7 +61,7 @@
 
         <TextView
             android:id="@+id/childRoomTopic"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
@@ -87,7 +87,7 @@
 
         <TextView
             android:id="@+id/spaceChildMemberCountText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index e93c87dcc3..3931c6c30d 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -46,7 +46,7 @@
 
     <TextView
         android:id="@+id/childSpaceName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 94c11c5403..733e9d065f 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/spaceSummaryMemberCountText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/spaceSummaryTopic"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index b15a6b6fd4..d915ce28aa 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -35,7 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -57,7 +57,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 9ecbc56239..28803daef1 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -59,7 +59,7 @@
 
     <TextView
         android:id="@+id/suggestedRoomDescription"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/joinSuggestedRoomButton"
-        style="@style/Button.Vector.Style.Outlined"
+        style="@style/Widget.Vector.Button.Outlined"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 704f387062..141e37a45a 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@+id/messageTimeView"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index d5662303dc..d57acd93f9 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/itemCallCreatorNameTextView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/itemCallKindTextView"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/itemCallStatusTextView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -64,7 +64,7 @@
 
         <Button
             android:id="@+id/itemCallAcceptView"
-            style="@style/Button.Vector.Style.Positive"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
@@ -77,7 +77,7 @@
 
         <Button
             android:id="@+id/itemCallRejectView"
-            style="@style/Button.Vector.Style.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
index 73f0ae45af..280dc77d5f 100644
--- a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
@@ -10,7 +10,7 @@
 
         <TextView
             android:id="@+id/codeBlockTextView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="monospace" />
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/codeBlockEditedView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp" />
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index c45149c818..ea881ccdd0 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/roomCreateItemDescription"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 29fc757fe2..7b5e62dca2 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -15,7 +15,7 @@
 
     <TextView
         android:id="@+id/itemDayTextView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index 38d2cc672b..a5357f2227 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -17,7 +17,7 @@
 
     <TextView
         android:id="@+id/itemDefaultTextView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index e2ef700b36..bf6a5b7479 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -41,7 +41,7 @@
     <!-- the media -->
     <TextView
         android:id="@+id/messageFilenameView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index 93347c9de1..cfa5d1d3b9 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/itemMergedSummaryTextView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index bfcad9ebad..c8d635bada 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/roomNameTileText"
-            style="@style/TextView.Vector.Title"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -77,7 +77,7 @@
 
         <TextView
             android:id="@+id/roomNameDescriptionText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -90,7 +90,7 @@
 
         <TextView
             android:id="@+id/roomNameTopicText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -126,7 +126,7 @@
                 android:src="@drawable/ic_add_people" />
 
             <TextView
-                style="@style/TextView.Vector.Body"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -156,7 +156,7 @@
 
         <TextView
             android:id="@+id/itemNoticeTextView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -173,7 +173,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 3b4fa2d6b8..abcd679dea 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneTitleTextView"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneDetailTextView"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index 54ab7141be..8b024849cc 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -17,7 +17,7 @@
 
     <TextView
         android:id="@+id/itemNoticeTextView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index 251f77323a..e3a8bd7df4 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/optionLabelText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
@@ -23,7 +23,7 @@
         <!-- Filled at runtime with buttons -->
         <!--Button
             android:id="@+id/pollButton1"
-            style="@style/Button.Vector.Style.Outlined.Poll"
+            style="@style/Widget.Vector.Button.Outlined.Poll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Create Github issue" /-->
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index cd9decaceb..03504b12d9 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -23,7 +23,7 @@
 
         <TextView
             android:id="@+id/pollLabelText"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -36,7 +36,7 @@
 
     <Button
         android:id="@+id/pollButton1"
-        style="@style/Button.Vector.Style.Outlined.Poll"
+        style="@style/Widget.Vector.Button.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -45,7 +45,7 @@
 
     <Button
         android:id="@+id/pollButton2"
-        style="@style/Button.Vector.Style.Outlined.Poll"
+        style="@style/Widget.Vector.Button.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -54,7 +54,7 @@
 
     <Button
         android:id="@+id/pollButton3"
-        style="@style/Button.Vector.Style.Outlined.Poll"
+        style="@style/Widget.Vector.Button.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -63,7 +63,7 @@
 
     <Button
         android:id="@+id/pollButton4"
-        style="@style/Button.Vector.Style.Outlined.Poll"
+        style="@style/Widget.Vector.Button.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -72,7 +72,7 @@
 
     <Button
         android:id="@+id/pollButton5"
-        style="@style/Button.Vector.Style.Outlined.Poll"
+        style="@style/Widget.Vector.Button.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -134,7 +134,7 @@
 
     <TextView
         android:id="@+id/pollInfosText"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index 30ace00ae0..f2dbb3e6c6 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -1,6 +1,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/TextView.Vector.Body"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:drawablePadding="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index 9da2491595..fb2d8c2057 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneTitleTextView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneDetailTextView"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 1dcb2bf982..39df45989c 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/messageTextView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 05ab145134..66d9a71e39 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemVerificationTitleTextView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDetailTextView"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -44,7 +44,7 @@
 
         <Button
             android:id="@+id/sas_verification_verified_decline_button"
-            style="@style/Button.Vector.Style.Destructive"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -52,7 +52,7 @@
 
         <Button
             android:id="@+id/sas_verification_verified_accept_button"
-            style="@style/Button.Vector.Style.Positive"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/accept" />
@@ -61,7 +61,7 @@
 
     <TextView
         android:id="@+id/itemVerificationStatusText"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index e2100aa4db..1e73fc09a7 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemWidgetTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="6dp"
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index a607e60b5d..d78547748d 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -13,7 +13,7 @@
         android:background="@color/notification_accent_color" />
 
     <TextView
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index efbe37d525..0a02ff7f54 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/term_name"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/term_description"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index 7365fabdd9..c6428861c3 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemUnknownRoomName"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index 9877cf194b..cc4b43ea92 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/uploadsFileTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -39,7 +39,7 @@
 
     <TextView
         android:id="@+id/uploadsFileSubtitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index d5162a21e7..5ea46822ac 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemUserId"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/itemUserName"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index 9c6042c1e7..9b672238ae 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userDirectoryLetterView"
-    style="@style/TextView.Vector.HeadlineMedium"
+    style="@style/Widget.Vector.TextView.HeadlineMedium"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index 3de79698ad..6faa957862 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userListHeaderView"
-    style="@style/TextView.Vector.HeadlineMedium"
+    style="@style/Widget.Vector.TextView.HeadlineMedium"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index ef6a66554f..d0afcea5f2 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/itemVerificationActionTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -49,7 +49,7 @@
 
     <TextView
         android:id="@+id/itemVerificationActionSubTitle"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_verification_decimal_code.xml b/vector/src/main/res/layout/item_verification_decimal_code.xml
index 2f7632ca05..ed6ed767d4 100644
--- a/vector/src/main/res/layout/item_verification_decimal_code.xml
+++ b/vector/src/main/res/layout/item_verification_decimal_code.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationDecimalCode"
-    style="@style/TextView.Vector.Title"
+    style="@style/Widget.Vector.TextView.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index 5205c418a3..2bc83fc993 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationNoticeText"
-    style="@style/TextView.Vector.Body"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index a1cb32a353..d406fed84f 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/use_latest_riot"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="start"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/app_desktop_web"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -67,7 +67,7 @@
 
     <TextView
         android:id="@+id/app_ios_android"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -87,7 +87,7 @@
 
 
     <TextView
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index b9a3945596..6a265f4edc 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemVerificationWaitingTitle"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/media_upload_download_progress_layout.xml b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
index 8e6db4570e..d62bb65190 100644
--- a/vector/src/main/res/layout/media_upload_download_progress_layout.xml
+++ b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/mediaProgressTextView"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index 949fdb28c7..af8eb0090d 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/overlayCounterText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/overlayInfoText"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index 5025e2f62e..3288b5bbe5 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -43,7 +43,7 @@
 
                 <TextView
                     android:id="@+id/waitingStatusText"
-                    style="@style/TextView.Vector.Body"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/option_buttons.xml b/vector/src/main/res/layout/option_buttons.xml
index ae49294f2f..2ec63fd2f5 100644
--- a/vector/src/main/res/layout/option_buttons.xml
+++ b/vector/src/main/res/layout/option_buttons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Button.Vector.Style.Unelevated.Bot"
+    style="@style/Widget.Vector.Button.Unelevated.Bot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:text="Create Github issue" />
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index 1336de1bb5..f31e86ed96 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/reactionText"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
         android:layout_marginStart="6dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/reactionCount"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index d6a3e5ea7a..9ad6be6d69 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -7,7 +7,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/actionUnreadCounterBadgeView"
-        style="@style/TextView.Vector.Micro"
+        style="@style/Widget.Vector.TextView.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index c27bf9eaa8..6dc5fd41c7 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/inviteNameView"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/inviteIdentifierView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -49,7 +49,7 @@
 
     <TextView
         android:id="@+id/inviteLabelView"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
diff --git a/vector/src/main/res/layout/vector_preference_push_rule.xml b/vector/src/main/res/layout/vector_preference_push_rule.xml
index c05c1a8da1..5242bfdf85 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -19,7 +19,7 @@
 
         <TextView
             android:id="@android:id/title"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@android:id/summary"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index b4f96b9115..9f26ed9a1a 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/activeConferenceInfo"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/deleteWidgetButton"
@@ -27,7 +27,7 @@
 
     <Button
         android:id="@+id/deleteWidgetButton"
-        style="@style/Button.Vector.Style.Text.OnPrimary"
+        style="@style/Widget.Vector.Button.Text.OnPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/activeConferenceInfo"
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index f8bc436196..5056f38e09 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/bottomSheetActionTitle"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -54,7 +54,7 @@
 
         <TextView
             android:id="@+id/bottomSheetActionSubTitle"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/view_button_state.xml b/vector/src/main/res/layout/view_button_state.xml
index 41a08cbc73..5cc63ca59f 100644
--- a/vector/src/main/res/layout/view_button_state.xml
+++ b/vector/src/main/res/layout/view_button_state.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/buttonStateButtonFlat"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -46,7 +46,7 @@
 
     <Button
         android:id="@+id/buttonStateRetry"
-        style="@style/Button.Vector.Style.Text"
+        style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml
index d893b621f5..36a999e275 100644
--- a/vector/src/main/res/layout/view_current_calls.xml
+++ b/vector/src/main/res/layout/view_current_calls.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/currentCallsInfo"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/returnToCallButton"
@@ -27,7 +27,7 @@
 
     <Button
         android:id="@+id/returnToCallButton"
-        style="@style/Button.Vector.Style.Text.OnPrimary"
+        style="@style/Widget.Vector.Button.Text.OnPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/currentCallsInfo"
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index b5bf43c027..3e0e307dc3 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -20,7 +20,7 @@
 
     <TextView
         android:id="@+id/failedMessagesWarningTextView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -49,7 +49,7 @@
 
     <Button
         android:id="@+id/failedMessagesRetryButton"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/view_file_icon.xml b/vector/src/main/res/layout/view_file_icon.xml
index b3989963ac..1c5268a50b 100644
--- a/vector/src/main/res/layout/view_file_icon.xml
+++ b/vector/src/main/res/layout/view_file_icon.xml
@@ -8,7 +8,7 @@
 
     <ProgressBar
         android:id="@+id/messageFileProgressbar"
-        style="@style/ProgressBar.Vector.File"
+        style="@style/Widget.Vector.ProgressBar.Horizontal.File"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:progress="40" />
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 7785612127..7850435c2d 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/jumpToReadMarkerLabelView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@+id/closeJumpToReadMarkerView"
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 400f017bc5..7dcb3d223a 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_1"
-        style="@style/TextView.Vector.HeadlineMedium"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
@@ -44,7 +44,7 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_2"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
diff --git a/vector/src/main/res/layout/view_notification_area.xml b/vector/src/main/res/layout/view_notification_area.xml
index adc2dad32b..5e3a79291c 100644
--- a/vector/src/main/res/layout/view_notification_area.xml
+++ b/vector/src/main/res/layout/view_notification_area.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/roomNotificationMessage"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
index 856a32c9ca..6238aa1b05 100644
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ b/vector/src/main/res/layout/view_poll_result_line.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/pollResultItemLabel"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -32,7 +32,7 @@
 
     <TextView
         android:id="@+id/pollResultItemPercent"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index a6be054289..65eb02e95c 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/receiptMore"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index c88f667ad1..06f73c0db4 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/receiptMore"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/item_event_message_state_size"
         android:background="@drawable/pill_receipt"
diff --git a/vector/src/main/res/layout/view_room_widgets_banner.xml b/vector/src/main/res/layout/view_room_widgets_banner.xml
index 0babfbdab8..f0184d0144 100644
--- a/vector/src/main/res/layout/view_room_widgets_banner.xml
+++ b/vector/src/main/res/layout/view_room_widgets_banner.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsLabel"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsViewAction"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
index d8ee1ddca9..46361f24b0 100644
--- a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/actionTitleText"
-            style="@style/TextView.Vector.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.HeadlineMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index 31534cf124..fa4aa887be 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/TextView.Vector.Subtitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/subTitle"
-        style="@style/TextView.Vector.Caption"
+        style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index b2d0f8a5f4..782bba6588 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/errorMessageView"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -75,7 +75,7 @@
 
         <TextView
             android:id="@+id/emptyTitleView"
-            style="@style/TextView.Vector.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -91,7 +91,7 @@
 
         <TextView
             android:id="@+id/emptyMessageView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="220dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index e34466ccf8..e7d930b070 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/memberProfileNameView"
-            style="@style/TextView.Vector.Title"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -54,7 +54,7 @@
 
         <TextView
             android:id="@+id/memberProfileIdView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -69,7 +69,7 @@
 
         <TextView
             android:id="@+id/memberProfilePowerLevelView"
-            style="@style/TextView.Vector.Caption"
+            style="@style/Widget.Vector.TextView.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -83,7 +83,7 @@
 
         <TextView
             android:id="@+id/memberProfileStatusView"
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 3c4bd7ce80..7308e8a207 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/roomProfileNameView"
-        style="@style/TextView.Vector.Title"
+        style="@style/Widget.Vector.TextView.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -44,7 +44,7 @@
 
     <TextView
         android:id="@+id/roomProfileAliasView"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/view_sync_state.xml b/vector/src/main/res/layout/view_sync_state.xml
index 6167a9e4ab..55b8d4524a 100644
--- a/vector/src/main/res/layout/view_sync_state.xml
+++ b/vector/src/main/res/layout/view_sync_state.xml
@@ -16,7 +16,7 @@
         tools:visibility="visible">
 
         <ProgressBar
-            style="@style/ProgressBar.Vector.Horizontal"
+            style="@style/Widget.Vector.ProgressBar.Horizontal"
             android:layout_width="match_parent"
             android:layout_height="14dp"
             android:layout_gravity="center"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/syncStateNoNetwork"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorError"
@@ -47,7 +47,7 @@
         tools:visibility="visible">
 
         <TextView
-            style="@style/TextView.Vector.Body"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml
index 218b36df96..72030384f6 100644
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/url_preview_title"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/url_preview_description"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
@@ -60,7 +60,7 @@
 
     <TextView
         android:id="@+id/url_preview_site"
-        style="@style/TextView.Vector.Body"
+        style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"

From 1a898f04049558f2d48d11434f6c2bd482522bba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 12:05:10 +0200
Subject: [PATCH 42/49] Rename themes follow Android conventions

---
 .../ui-styles/src/debug/AndroidManifest.xml   | 22 +++++++++----------
 .../src/debug/res/values/debug_styles.xml     |  8 +++----
 .../src/main/res/values-v23/theme_black.xml   |  4 ++--
 .../src/main/res/values-v23/theme_dark.xml    |  4 ++--
 .../src/main/res/values-v23/theme_light.xml   |  4 ++--
 .../src/main/res/values-v27/theme_black.xml   |  4 ++--
 .../src/main/res/values-v27/theme_dark.xml    |  4 ++--
 .../src/main/res/values-v27/theme_light.xml   |  4 ++--
 .../src/main/res/values/theme_black.xml       |  4 ++--
 .../src/main/res/values/theme_common.xml      |  8 +++----
 .../src/main/res/values/theme_dark.xml        |  4 ++--
 .../src/main/res/values/theme_light.xml       |  4 ++--
 vector/src/debug/res/layout/demo_themes.xml   |  6 ++---
 vector/src/main/AndroidManifest.xml           |  8 +++----
 .../features/themes/ActivityOtherThemes.kt    | 16 +++++++-------
 .../vector/app/features/themes/ThemeUtils.kt  |  8 +++----
 16 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/library/ui-styles/src/debug/AndroidManifest.xml b/library/ui-styles/src/debug/AndroidManifest.xml
index 57020a0518..e32676136d 100644
--- a/library/ui-styles/src/debug/AndroidManifest.xml
+++ b/library/ui-styles/src/debug/AndroidManifest.xml
@@ -2,39 +2,39 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="im.vector.lib.ui.styles">
 
-    <application android:theme="@style/AppTheme.Light">
+    <application android:theme="@style/Theme.Vector.Light">
         <activity
             android:name=".debug.DebugMaterialThemeLightDefaultActivity"
-            android:theme="@style/VectorMaterialThemeDebugLight" />
+            android:theme="@style/Theme.Debug.Light" />
         <activity
             android:name=".debug.DebugMaterialThemeLightTestActivity"
-            android:theme="@style/VectorMaterialThemeDebugLight.Test" />
+            android:theme="@style/Theme.Debug.Light.Test" />
         <activity
             android:name=".debug.DebugMaterialThemeLightVectorActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/Theme.Vector.Light" />
         <activity
             android:name=".debug.DebugMaterialThemeDarkDefaultActivity"
-            android:theme="@style/VectorMaterialThemeDebugDark" />
+            android:theme="@style/Theme.Debug.Dark" />
         <activity
             android:name=".debug.DebugMaterialThemeDarkTestActivity"
-            android:theme="@style/VectorMaterialThemeDebugDark.Test" />
+            android:theme="@style/Theme.Debug.Dark.Test" />
         <activity
             android:name=".debug.DebugMaterialThemeDarkVectorActivity"
-            android:theme="@style/AppTheme.Dark" />
+            android:theme="@style/Theme.Vector.Dark" />
 
         <activity
             android:name=".debug.DebugVectorButtonStylesLightActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/Theme.Vector.Light" />
         <activity
             android:name=".debug.DebugVectorButtonStylesDarkActivity"
-            android:theme="@style/AppTheme.Dark" />
+            android:theme="@style/Theme.Vector.Dark" />
 
         <activity
             android:name=".debug.DebugVectorTextViewLightActivity"
-            android:theme="@style/AppTheme.Light" />
+            android:theme="@style/Theme.Vector.Light" />
         <activity
             android:name=".debug.DebugVectorTextViewDarkActivity"
-            android:theme="@style/AppTheme.Dark" />
+            android:theme="@style/Theme.Vector.Dark" />
     </application>
 
 </manifest>
diff --git a/library/ui-styles/src/debug/res/values/debug_styles.xml b/library/ui-styles/src/debug/res/values/debug_styles.xml
index 090de4dd4b..d025ba1784 100644
--- a/library/ui-styles/src/debug/res/values/debug_styles.xml
+++ b/library/ui-styles/src/debug/res/values/debug_styles.xml
@@ -6,11 +6,11 @@
     </style>
 
 
-    <style name="VectorMaterialThemeDebugLight" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Debug.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Keep all default value -->
     </style>
 
-    <style name="VectorMaterialThemeDebugLight.Test">
+    <style name="Theme.Debug.Light.Test">
         <item name="colorPrimary">#7F7F00</item>
         <item name="colorPrimaryVariant">#00FF00</item>
         <item name="colorOnPrimary">#0000FF</item>
@@ -34,11 +34,11 @@
         <item name="android:textColorLink">#000FFF</item>
     </style>
 
-    <style name="VectorMaterialThemeDebugDark" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="Theme.Debug.Dark" parent="Theme.MaterialComponents.NoActionBar">
         <!-- Keep all default value -->
     </style>
 
-    <style name="VectorMaterialThemeDebugDark.Test">
+    <style name="Theme.Debug.Dark.Test">
         <item name="colorPrimary">#7F7F00</item>
         <item name="colorPrimaryVariant">#00FF00</item>
         <item name="colorOnPrimary">#0000FF</item>
diff --git a/library/ui-styles/src/main/res/values-v23/theme_black.xml b/library/ui-styles/src/main/res/values-v23/theme_black.xml
index ad6abc9fbe..e0399f6449 100644
--- a/library/ui-styles/src/main/res/values-v23/theme_black.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_black.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Black.v23" parent="AppTheme.Base.Black">
+    <style name="Theme.Vector.Black.v23" parent="Base.Theme.Vector.Black">
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
-    <style name="AppTheme.Black" parent="AppTheme.Black.v23"/>
+    <style name="Theme.Vector.Black" parent="Theme.Vector.Black.v23"/>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v23/theme_dark.xml b/library/ui-styles/src/main/res/values-v23/theme_dark.xml
index c9fb7dab28..45b340eaad 100644
--- a/library/ui-styles/src/main/res/values-v23/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_dark.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Dark.v23" parent="AppTheme.Base.Dark">
+    <style name="Theme.Vector.Dark.v23" parent="Base.Theme.Vector.Dark">
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
-    <style name="AppTheme.Dark" parent="AppTheme.Dark.v23"/>
+    <style name="Theme.Vector.Dark" parent="Theme.Vector.Dark.v23"/>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v23/theme_light.xml b/library/ui-styles/src/main/res/values-v23/theme_light.xml
index 43d0027e17..28a78b98bf 100644
--- a/library/ui-styles/src/main/res/values-v23/theme_light.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_light.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Light.v23" parent="AppTheme.Base.Light">
+    <style name="Theme.Vector.Light.v23" parent="Base.Theme.Vector.Light">
         <item name="android:statusBarColor">@color/android_status_bar_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Light.v23"/>
+    <style name="Theme.Vector.Light" parent="Theme.Vector.Light.v23"/>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_black.xml b/library/ui-styles/src/main/res/values-v27/theme_black.xml
index f8650c7e8b..2a18b021e3 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_black.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_black.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Black.v27" parent="AppTheme.Black.v23">
+    <style name="Theme.Vector.Black.v27" parent="Theme.Vector.Black.v23">
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
-    <style name="AppTheme.Black" parent="AppTheme.Black.v27" />
+    <style name="Theme.Vector.Black" parent="Theme.Vector.Black.v27" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_dark.xml b/library/ui-styles/src/main/res/values-v27/theme_dark.xml
index ef0a39902a..ee654bbaab 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_dark.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Dark.v27" parent="AppTheme.Dark.v23">
+    <style name="Theme.Vector.Dark.v27" parent="Theme.Vector.Dark.v23">
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
-    <style name="AppTheme.Dark" parent="AppTheme.Dark.v27" />
+    <style name="Theme.Vector.Dark" parent="Theme.Vector.Dark.v27" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-v27/theme_light.xml b/library/ui-styles/src/main/res/values-v27/theme_light.xml
index 4755516267..0151130f5a 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_light.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_light.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Light.v27" parent="AppTheme.Light.v23">
+    <style name="Theme.Vector.Light.v27" parent="Theme.Vector.Light.v23">
         <item name="android:navigationBarColor">@color/android_navigation_bar_background_light</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Light.v27" />
+    <style name="Theme.Vector.Light" parent="Theme.Vector.Light.v27" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index 0cce560b52..6db7e5a663 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -3,7 +3,7 @@
 
     <!-- BLACK THEME COLORS -->
 
-    <style name="AppTheme.Base.Black" parent="AppTheme.Base.Dark">
+    <style name="Base.Theme.Vector.Black" parent="Base.Theme.Vector.Dark">
         <!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
 
         <!-- other colors -->
@@ -31,6 +31,6 @@
         <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 
-    <style name="AppTheme.Black" parent="AppTheme.Base.Black" />
+    <style name="Theme.Vector.Black" parent="Base.Theme.Vector.Black" />
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/theme_common.xml b/library/ui-styles/src/main/res/values/theme_common.xml
index 2fcbd36bdf..2e9c2c5123 100644
--- a/library/ui-styles/src/main/res/values/theme_common.xml
+++ b/library/ui-styles/src/main/res/values/theme_common.xml
@@ -2,21 +2,19 @@
 <resources>
 
     <!-- Launcher Theme, only used for VectorLauncherActivity (will be use even before the Activity is started) -->
-    <style name="AppTheme.Launcher" parent="AppTheme.Launcher.Base"/>
-
-    <style name="AppTheme.Launcher.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Vector.Launcher" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
         <item name="colorPrimary">@color/element_accent_light</item>
         <item name="android:statusBarColor">@color/element_accent_light</item>
         <item name="android:navigationBarColor">@color/element_accent_light</item>
     </style>
 
-    <style name="AppTheme.AttachmentsPreview" parent="AppTheme.Base.Black">
+    <style name="Theme.Vector.Black.AttachmentsPreview">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="AppTheme.Transparent" parent="AppTheme.Base.Black">
+    <style name="Theme.Vector.Black.Transparent">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 256ee72c2d..3c9d3ada33 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -3,7 +3,7 @@
 
     <!-- DARK THEME COLORS -->
 
-    <style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="Base.Theme.Vector.Dark" parent="Theme.MaterialComponents.NoActionBar">
         <!-- Element attribute for palette -->
         <!-- content colors -->
         <item name="vctr_content_primary">@color/element_content_primary_dark</item>
@@ -132,6 +132,6 @@
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
     </style>
 
-    <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
+    <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 49cd85e4d0..08d9761a7a 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -3,7 +3,7 @@
 
     <!-- LIGHT THEME COLORS -->
 
-    <style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Base.Theme.Vector.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Element attribute for palette -->
         <!-- content colors -->
         <item name="vctr_content_primary">@color/element_content_primary_light</item>
@@ -134,6 +134,6 @@
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
     </style>
 
-    <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
+    <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
 
 </resources>
diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector/src/debug/res/layout/demo_themes.xml
index 7cd4a77066..3b2f5acbf0 100644
--- a/vector/src/debug/res/layout/demo_themes.xml
+++ b/vector/src/debug/res/layout/demo_themes.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:theme="@style/AppTheme.Light">
+        android:theme="@style/Theme.Vector.Light">
 
         <include layout="@layout/demo_theme_sample" />
 
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:theme="@style/AppTheme.Dark">
+        android:theme="@style/Theme.Vector.Dark">
 
         <include layout="@layout/demo_theme_sample" />
 
@@ -34,7 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:theme="@style/AppTheme.Black">
+        android:theme="@style/Theme.Vector.Black">
 
         <include layout="@layout/demo_theme_sample" />
 
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index f601dc88dd..e71f355a23 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -75,7 +75,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Light"
+        android:theme="@style/Theme.Vector.Light"
         tools:replace="android:allowBackup">
 
         <!-- No limit for screen ratio: avoid black strips -->
@@ -85,7 +85,7 @@
 
         <activity
             android:name=".features.MainActivity"
-            android:theme="@style/AppTheme.Launcher" />
+            android:theme="@style/Theme.Vector.Launcher" />
 
         <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
         <activity-alias
@@ -141,7 +141,7 @@
         <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite :/ -->
         <activity
             android:name=".features.media.VectorAttachmentViewerActivity"
-            android:theme="@style/AppTheme.Transparent"
+            android:theme="@style/Theme.Vector.Black.Transparent"
             tools:ignore="Instantiatable" />
 
         <activity android:name=".features.media.BigImageViewerActivity" />
@@ -268,7 +268,7 @@
 
         <activity
             android:name=".features.attachments.preview.AttachmentsPreviewActivity"
-            android:theme="@style/AppTheme.AttachmentsPreview" />
+            android:theme="@style/Theme.Vector.Black.AttachmentsPreview" />
         <activity
             android:name=".features.call.VectorCallActivity"
             android:excludeFromRecents="true" />
diff --git a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
index a1065ed10b..8c21e96bea 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
@@ -27,22 +27,22 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int,
                                  @StyleRes val black: Int) {
 
     object Default : ActivityOtherThemes(
-            R.style.AppTheme_Dark,
-            R.style.AppTheme_Black
+            R.style.Theme_Vector_Dark,
+            R.style.Theme_Vector_Black
     )
 
     object Launcher : ActivityOtherThemes(
-            R.style.AppTheme_Launcher,
-            R.style.AppTheme_Launcher
+            R.style.Theme_Vector_Launcher,
+            R.style.Theme_Vector_Launcher
     )
 
     object AttachmentsPreview : ActivityOtherThemes(
-            R.style.AppTheme_AttachmentsPreview,
-            R.style.AppTheme_AttachmentsPreview
+            R.style.Theme_Vector_Black_AttachmentsPreview,
+            R.style.Theme_Vector_Black_AttachmentsPreview
     )
 
     object VectorAttachmentsPreview : ActivityOtherThemes(
-            R.style.AppTheme_Transparent,
-            R.style.AppTheme_Transparent
+            R.style.Theme_Vector_Black_Transparent,
+            R.style.Theme_Vector_Black_Transparent
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index db8ad61c0a..c4c9ca63ae 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -114,10 +114,10 @@ object ThemeUtils {
         currentTheme.set(aTheme)
         context.setTheme(
                 when (aTheme) {
-                    SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.AppTheme_Dark else R.style.AppTheme_Light
-                    THEME_DARK_VALUE   -> R.style.AppTheme_Dark
-                    THEME_BLACK_VALUE  -> R.style.AppTheme_Black
-                    else               -> R.style.AppTheme_Light
+                    SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.Theme_Vector_Dark else R.style.Theme_Vector_Light
+                    THEME_DARK_VALUE   -> R.style.Theme_Vector_Dark
+                    THEME_BLACK_VALUE  -> R.style.Theme_Vector_Black
+                    else               -> R.style.Theme_Vector_Light
                 }
         )
 

From 71b456c57e2731bb4bf1aaa40a53aae75c3ee151 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 14:50:35 +0200
Subject: [PATCH 43/49] Add style to TextView after merge

---
 .../layout/bottom_sheet_space_create_private_warning.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml b/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml
index 7292c7df55..6e46c87548 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_create_private_warning.xml
@@ -16,6 +16,7 @@
         android:src="@drawable/ic_beta_pill" />
 
     <TextView
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
@@ -23,17 +24,16 @@
         android:gravity="center"
         android:text="@string/teammate_spaces_arent_quite_ready"
         android:textColor="?vctr_content_primary"
-        android:textSize="20sp"
         android:textStyle="bold" />
 
     <TextView
+        style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
         android:gravity="center"
         android:text="@string/teammate_spaces_might_not_join"
-        android:textColor="?vctr_content_secondary"
-        android:textSize="16sp" />
+        android:textColor="?vctr_content_secondary" />
 
     <Button
         android:id="@+id/continueButton"

From f313fbe88cc532277cc937ec1f8402ae79e9d465 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 16:34:03 +0200
Subject: [PATCH 44/49] Fix mistake on call buttons

---
 .../room/detail/timeline/item/CallTileTimelineItem.kt     | 8 ++++----
 .../src/main/res/layout/alerter_incoming_call_layout.xml  | 8 ++++++--
 vector/src/main/res/layout/view_call_controls.xml         | 3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
index a9b6bbf0aa..1f12bdbd2c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
@@ -69,7 +69,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
             holder.acceptView.onClick {
                 attributes.callback?.onTimelineItemAction(RoomDetailAction.AcceptCall(callId = attributes.callId))
             }
-            holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorError)
+            holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
             holder.rejectView.onClick {
                 attributes.callback?.onTimelineItemAction(RoomDetailAction.EndCall)
             }
@@ -78,17 +78,17 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
                 CallKind.CONFERENCE -> {
                     holder.rejectView.setText(R.string.ignore)
                     holder.acceptView.setText(R.string.join)
-                    holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorPrimary)
+                    holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
                 }
                 CallKind.AUDIO      -> {
                     holder.rejectView.setText(R.string.call_notification_reject)
                     holder.acceptView.setText(R.string.call_notification_answer)
-                    holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorPrimary)
+                    holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
                 }
                 CallKind.VIDEO      -> {
                     holder.rejectView.setText(R.string.call_notification_reject)
                     holder.acceptView.setText(R.string.call_notification_answer)
-                    holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorPrimary)
+                    holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorOnPrimary)
                 }
                 else                -> {
                     Timber.w("Shouldn't be in that state")
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index 781441ef1f..82616e541b 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -67,7 +67,9 @@
         android:src="@drawable/ic_call_answer"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorOnPrimary"
+        tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/incomingCallRejectView"
@@ -83,6 +85,8 @@
         android:src="@drawable/ic_call_hangup"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/incomingCallAcceptView"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorOnPrimary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml
index 789df58370..2ef5be5ad0 100644
--- a/vector/src/main/res/layout/view_call_controls.xml
+++ b/vector/src/main/res/layout/view_call_controls.xml
@@ -25,6 +25,7 @@
             android:focusable="true"
             android:padding="12dp"
             android:src="@drawable/ic_call_answer"
+            app:tint="?colorOnPrimary"
             tools:ignore="MissingConstraints,MissingPrefix" />
 
         <ImageView
@@ -38,6 +39,7 @@
             android:focusable="true"
             android:padding="12dp"
             android:src="@drawable/ic_call_hangup"
+            app:tint="?colorOnPrimary"
             tools:ignore="MissingConstraints,MissingPrefix" />
 
         <androidx.constraintlayout.helper.widget.Flow
@@ -100,6 +102,7 @@
             android:focusable="true"
             android:padding="12dp"
             android:src="@drawable/ic_call_hangup"
+            app:tint="?colorOnPrimary"
             tools:ignore="MissingConstraints,MissingPrefix" />
 
         <ImageView

From 58cd2aac139c4f496eee9178abad667e8fe568dc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 16:45:50 +0200
Subject: [PATCH 45/49] Fix crash (regression on develop) on the
 VerificationVectorAlert And format code

---
 .../vector/app/features/popup/IncomingCallAlert.kt   |  3 +--
 .../app/features/popup/VerificationVectorAlert.kt    |  7 ++-----
 .../main/res/layout/alerter_verification_layout.xml  | 12 +++++++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
index 8a4fc7a78d..fe9b0c86b9 100644
--- a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
@@ -40,8 +40,7 @@ class IncomingCallAlert(uid: String,
                      private val avatarRenderer: AvatarRenderer,
                      private val isVideoCall: Boolean,
                      private val onAccept: () -> Unit,
-                     private val onReject: () -> Unit)
-        : VectorAlert.ViewBinder {
+                     private val onReject: () -> Unit) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
             val (callKindText, callKindIcon) = if (isVideoCall) {
diff --git a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
index ee6728f969..70663ec58d 100644
--- a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
@@ -33,14 +33,11 @@ class VerificationVectorAlert(uid: String,
                                * Alert are displayed by default, but let this lambda return false to prevent displaying
                                */
                               override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
-) : DefaultVectorAlert(
-        uid, title, description, iconId, shouldBeDisplayedIn
-) {
+) : DefaultVectorAlert(uid, title, description, iconId, shouldBeDisplayedIn) {
     override val layoutRes = R.layout.alerter_verification_layout
 
     class ViewBinder(private val matrixItem: MatrixItem?,
-                     private val avatarRenderer: AvatarRenderer)
-        : VectorAlert.ViewBinder {
+                     private val avatarRenderer: AvatarRenderer) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
             view.findViewById<ImageView>(R.id.ivUserAvatar)?.let { imageView ->
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 482dc738cb..5da9102e1e 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    tools:background="@android:color/darker_gray"
-    tools:foreground="?android:attr/selectableItemBackground"
+    tools:background="?colorPrimary"
     tools:style="@style/AlertStyle">
 
     <ImageView
@@ -20,7 +19,8 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
 
-    <ImageView
+    <!-- Note: this is handled by the Alerter library, it has to be a AppCompatImageView -->
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/ivIcon"
         android:layout_width="24dp"
         android:layout_height="24dp"
@@ -42,7 +42,8 @@
         app:layout_constraintStart_toEndOf="@id/ivUserAvatar"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
+        <!-- Note: this is handled by the Alerter library, it has to be a AppCompatTextView -->
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTitle"
             style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
@@ -56,7 +57,8 @@
             tools:text="Title"
             tools:visibility="visible" />
 
-        <TextView
+        <!-- Note: this is handled by the Alerter library, it has to be a AppCompatTextView -->
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvText"
             style="@style/Widget.Vector.TextView.Body"
             android:layout_width="wrap_content"

From 9b215d2df6ac8ba2f3fdded7bad5c0d56b14c9b2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 16:58:55 +0200
Subject: [PATCH 46/49] Fix color error for top right menu

---
 vector/src/main/res/menu/vector_room_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/menu/vector_room_profile.xml b/vector/src/main/res/menu/vector_room_profile.xml
index 0ac3412497..ef1bbbc7d8 100644
--- a/vector/src/main/res/menu/vector_room_profile.xml
+++ b/vector/src/main/res/menu/vector_room_profile.xml
@@ -5,6 +5,6 @@
         android:id="@+id/roomProfileShareAction"
         android:icon="@drawable/ic_material_share"
         android:title="@string/share"
-        app:iconTint="?vctr_content_secondary"
+        app:iconTint="?colorSecondary"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file

From 7a40841cbb869dd9c6e0110f701478eabb62ed25 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 17:16:47 +0200
Subject: [PATCH 47/49] Fix color for phone calls

---
 .../vector/app/features/popup/IncomingCallAlert.kt   |  8 ++++----
 .../src/main/res/drawable/ic_call_answer_video.xml   | 12 ++++++++++++
 .../main/res/layout/alerter_incoming_call_layout.xml |  5 +++--
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_call_answer_video.xml

diff --git a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
index fe9b0c86b9..33202403f9 100644
--- a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
@@ -43,10 +43,10 @@ class IncomingCallAlert(uid: String,
                      private val onReject: () -> Unit) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
-            val (callKindText, callKindIcon) = if (isVideoCall) {
-                Pair(R.string.action_video_call, R.drawable.ic_call_video_small)
+            val (callKindText, callKindIcon, callKindActionIcon) = if (isVideoCall) {
+                Triple(R.string.action_video_call, R.drawable.ic_call_video_small, R.drawable.ic_call_answer_video)
             } else {
-                Pair(R.string.action_voice_call, R.drawable.ic_call_audio_small)
+                Triple(R.string.action_voice_call, R.drawable.ic_call_audio_small, R.drawable.ic_call_answer)
             }
             view.findViewById<TextView>(R.id.incomingCallKindView).apply {
                 setText(callKindText)
@@ -60,7 +60,7 @@ class IncomingCallAlert(uid: String,
                 setOnClickListener {
                     onAccept()
                 }
-                setImageResource(callKindIcon)
+                setImageResource(callKindActionIcon)
             }
             view.findViewById<ImageView>(R.id.incomingCallRejectView).setOnClickListener {
                 onReject()
diff --git a/vector/src/main/res/drawable/ic_call_answer_video.xml b/vector/src/main/res/drawable/ic_call_answer_video.xml
new file mode 100644
index 0000000000..d3af4f7b70
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_call_answer_video.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M0.5,7.5C0.5,5.8432 1.8432,4.5 3.5,4.5H14.5C16.1569,4.5 17.5,5.8432 17.5,7.5V17.5C17.5,19.1569 16.1569,20.5 14.5,20.5H3.5C1.8432,20.5 0.5,19.1569 0.5,17.5V7.5Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M19.5,9.5L22.8753,6.7998C23.5301,6.2759 24.5,6.7421 24.5,7.5806V17.4194C24.5,18.2579 23.5301,18.7241 22.8753,18.2002L19.5,15.5V9.5Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index 82616e541b..8f737fb085 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -51,6 +51,7 @@
         app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
         app:layout_constraintStart_toStartOf="@id/incomingCallNameView"
         app:layout_constraintTop_toBottomOf="@id/incomingCallNameView"
+        tools:drawableStart="@drawable/ic_call_audio_small"
         tools:text="@string/action_voice_call" />
 
     <ImageView
@@ -64,12 +65,12 @@
         android:contentDescription="@string/call_notification_answer"
         android:focusable="true"
         android:padding="8dp"
-        android:src="@drawable/ic_call_answer"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?colorOnPrimary"
-        tools:ignore="MissingPrefix" />
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_call_answer" />
 
     <ImageView
         android:id="@+id/incomingCallRejectView"

From bae802d8dce6db71fa4024fdbc938b1b63d97b62 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 16 Jun 2021 17:52:52 +0200
Subject: [PATCH 48/49] convert some findViewById into ViewBinding

---
 .../BottomSheetVerificationEmojisItem.kt      | 23 ++++---
 .../app/features/popup/IncomingCallAlert.kt   | 26 +++----
 .../features/popup/VerificationVectorAlert.kt |  7 +-
 ...ficationTroubleshootRecyclerViewAdapter.kt | 67 +++++++++----------
 .../features/webview/VectorWebViewActivity.kt |  4 +-
 5 files changed, 56 insertions(+), 71 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
index decb9eaad5..e1b703e0fc 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
@@ -18,8 +18,6 @@ package im.vector.app.features.crypto.verification.epoxy
 
 import android.content.Context
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
@@ -27,6 +25,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.databinding.ItemEmojiVerifBinding
 import me.gujun.android.span.Span
 import me.gujun.android.span.image
 import me.gujun.android.span.span
@@ -68,16 +67,18 @@ abstract class BottomSheetVerificationEmojisItem : VectorEpoxyModel<BottomSheetV
     }
 
     private fun bindEmojiView(view: ViewGroup, rep: EmojiRepresentation) {
-        rep.drawableRes?.let {
-            view.findViewById<TextView>(R.id.item_emoji_tv).isVisible = false
-            view.findViewById<ImageView>(R.id.item_emoji_image).isVisible = true
-            view.findViewById<ImageView>(R.id.item_emoji_image).setImageDrawable(ContextCompat.getDrawable(view.context, it))
-        } ?: run {
-            view.findViewById<TextView>(R.id.item_emoji_tv).isVisible = true
-            view.findViewById<ImageView>(R.id.item_emoji_image).isVisible = false
-            view.findViewById<TextView>(R.id.item_emoji_tv).text = rep.emoji
+        val views = ItemEmojiVerifBinding.bind(view)
+        val drawableRes = rep.drawableRes
+        if (drawableRes != null) {
+            views.itemEmojiTv.isVisible = false
+            views.itemEmojiImage.isVisible = true
+            views.itemEmojiImage.setImageDrawable(ContextCompat.getDrawable(view.context, drawableRes))
+        } else {
+            views.itemEmojiTv.isVisible = true
+            views.itemEmojiImage.isVisible = false
+            views.itemEmojiTv.text = rep.emoji
         }
-        view.findViewById<TextView>(R.id.item_emoji_name_tv).setText(rep.nameResId)
+        views.itemEmojiNameTv.setText(rep.nameResId)
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
index 33202403f9..17ad35f07a 100644
--- a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
@@ -18,11 +18,10 @@ package im.vector.app.features.popup
 
 import android.app.Activity
 import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
 import im.vector.app.R
 import im.vector.app.core.extensions.setLeftDrawable
 import im.vector.app.core.glide.GlideApp
+import im.vector.app.databinding.AlerterIncomingCallLayoutBinding
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.util.MatrixItem
 
@@ -43,26 +42,21 @@ class IncomingCallAlert(uid: String,
                      private val onReject: () -> Unit) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
+            val views = AlerterIncomingCallLayoutBinding.bind(view)
             val (callKindText, callKindIcon, callKindActionIcon) = if (isVideoCall) {
                 Triple(R.string.action_video_call, R.drawable.ic_call_video_small, R.drawable.ic_call_answer_video)
             } else {
                 Triple(R.string.action_voice_call, R.drawable.ic_call_audio_small, R.drawable.ic_call_answer)
             }
-            view.findViewById<TextView>(R.id.incomingCallKindView).apply {
-                setText(callKindText)
-                setLeftDrawable(callKindIcon)
+            views.incomingCallKindView.setText(callKindText)
+            views.incomingCallKindView.setLeftDrawable(callKindIcon)
+            views.incomingCallNameView.text = matrixItem?.getBestName()
+            matrixItem?.let { avatarRenderer.render(it, views.incomingCallAvatar, GlideApp.with(view.context.applicationContext)) }
+            views.incomingCallAcceptView.setOnClickListener {
+                onAccept()
             }
-            view.findViewById<TextView>(R.id.incomingCallNameView).text = matrixItem?.getBestName()
-            view.findViewById<ImageView>(R.id.incomingCallAvatar)?.let { imageView ->
-                matrixItem?.let { avatarRenderer.render(it, imageView, GlideApp.with(view.context.applicationContext)) }
-            }
-            view.findViewById<ImageView>(R.id.incomingCallAcceptView).apply {
-                setOnClickListener {
-                    onAccept()
-                }
-                setImageResource(callKindActionIcon)
-            }
-            view.findViewById<ImageView>(R.id.incomingCallRejectView).setOnClickListener {
+            views.incomingCallAcceptView.setImageResource(callKindActionIcon)
+            views.incomingCallRejectView.setOnClickListener {
                 onReject()
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
index 70663ec58d..228c629161 100644
--- a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.popup
 
 import android.app.Activity
 import android.view.View
-import android.widget.ImageView
 import androidx.annotation.DrawableRes
 import im.vector.app.R
 import im.vector.app.core.glide.GlideApp
+import im.vector.app.databinding.AlerterVerificationLayoutBinding
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.util.MatrixItem
 
@@ -40,9 +40,8 @@ class VerificationVectorAlert(uid: String,
                      private val avatarRenderer: AvatarRenderer) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
-            view.findViewById<ImageView>(R.id.ivUserAvatar)?.let { imageView ->
-                matrixItem?.let { avatarRenderer.render(it, imageView, GlideApp.with(view.context.applicationContext)) }
-            }
+            val views = AlerterVerificationLayoutBinding.bind(view)
+            matrixItem?.let { avatarRenderer.render(it, views.ivUserAvatar, GlideApp.with(view.context.applicationContext)) }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
index fd7e3cbb6a..70e5bdff10 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
@@ -18,13 +18,10 @@ package im.vector.app.features.settings.troubleshoot
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import im.vector.app.R
+import im.vector.app.databinding.ItemNotificationTroubleshootBinding
 import im.vector.app.features.themes.ThemeUtils
 
 class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<TroubleshootTest>)
@@ -46,71 +43,67 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
     override fun getItemCount(): Int = tests.size
 
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val troubleshootProgressBar = itemView.findViewById<ProgressBar>(R.id.troubleshootProgressBar)
-        private val troubleshootTestTitle = itemView.findViewById<TextView>(R.id.troubleshootTestTitle)
-        private val troubleshootTestDescription = itemView.findViewById<TextView>(R.id.troubleshootTestDescription)
-        private val troubleshootStatusIcon = itemView.findViewById<ImageView>(R.id.troubleshootStatusIcon)
-        private val troubleshootTestButton = itemView.findViewById<Button>(R.id.troubleshootTestButton)
+        private val views = ItemNotificationTroubleshootBinding.bind(itemView)
 
         fun bind(test: TroubleshootTest) {
             val context = itemView.context
-            troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_primary))
-            troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
+            views.troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_primary))
+            views.troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
 
             when (test.status) {
                 TroubleshootTest.TestStatus.NOT_STARTED      -> {
-                    troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
+                    views.troubleshootTestTitle.setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
 
-                    troubleshootProgressBar.visibility = View.INVISIBLE
-                    troubleshootStatusIcon.visibility = View.VISIBLE
-                    troubleshootStatusIcon.setImageResource(R.drawable.unit_test)
+                    views.troubleshootProgressBar.visibility = View.INVISIBLE
+                    views.troubleshootStatusIcon.visibility = View.VISIBLE
+                    views.troubleshootStatusIcon.setImageResource(R.drawable.unit_test)
                 }
                 TroubleshootTest.TestStatus.WAITING_FOR_USER -> {
-                    troubleshootProgressBar.visibility = View.INVISIBLE
-                    troubleshootStatusIcon.visibility = View.VISIBLE
+                    views.troubleshootProgressBar.visibility = View.INVISIBLE
+                    views.troubleshootStatusIcon.visibility = View.VISIBLE
                     val infoColor = ContextCompat.getColor(context, R.color.vector_info_color)
                     val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_notification_privacy_warning)?.apply {
                         ThemeUtils.tintDrawableWithColor(this, infoColor)
                     }
-                    troubleshootStatusIcon.setImageDrawable(drawable)
-                    troubleshootTestDescription.setTextColor(infoColor)
+                    views.troubleshootStatusIcon.setImageDrawable(drawable)
+                    views.troubleshootTestDescription.setTextColor(infoColor)
                 }
                 TroubleshootTest.TestStatus.RUNNING          -> {
-                    troubleshootProgressBar.visibility = View.VISIBLE
-                    troubleshootStatusIcon.visibility = View.INVISIBLE
+                    views.troubleshootProgressBar.visibility = View.VISIBLE
+                    views.troubleshootStatusIcon.visibility = View.INVISIBLE
                 }
                 TroubleshootTest.TestStatus.FAILED           -> {
-                    troubleshootProgressBar.visibility = View.INVISIBLE
-                    troubleshootStatusIcon.visibility = View.VISIBLE
-                    troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ko)
-                    troubleshootStatusIcon.imageTintList = null
-                    troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.colorError))
+                    views.troubleshootProgressBar.visibility = View.INVISIBLE
+                    views.troubleshootStatusIcon.visibility = View.VISIBLE
+                    views.troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ko)
+                    views.troubleshootStatusIcon.imageTintList = null
+                    views.troubleshootTestDescription.setTextColor(ThemeUtils.getColor(context, R.attr.colorError))
                 }
                 TroubleshootTest.TestStatus.SUCCESS          -> {
-                    troubleshootProgressBar.visibility = View.INVISIBLE
-                    troubleshootStatusIcon.visibility = View.VISIBLE
-                    troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ok)
+                    views.troubleshootProgressBar.visibility = View.INVISIBLE
+                    views.troubleshootStatusIcon.visibility = View.VISIBLE
+                    views.troubleshootStatusIcon.setImageResource(R.drawable.unit_test_ok)
                 }
             }
 
             val quickFix = test.quickFix
             if (quickFix != null) {
-                troubleshootTestButton.setText(test.quickFix!!.title)
-                troubleshootTestButton.setOnClickListener {
+                views.troubleshootTestButton.setText(test.quickFix!!.title)
+                views.troubleshootTestButton.setOnClickListener {
                     test.quickFix!!.doFix()
                 }
-                troubleshootTestButton.visibility = View.VISIBLE
+                views.troubleshootTestButton.visibility = View.VISIBLE
             } else {
-                troubleshootTestButton.visibility = View.GONE
+                views.troubleshootTestButton.visibility = View.GONE
             }
 
-            troubleshootTestTitle.setText(test.titleResId)
+            views.troubleshootTestTitle.setText(test.titleResId)
             val description = test.description
             if (description == null) {
-                troubleshootTestDescription.visibility = View.GONE
+                views.troubleshootTestDescription.visibility = View.GONE
             } else {
-                troubleshootTestDescription.visibility = View.VISIBLE
-                troubleshootTestDescription.text = description
+                views.troubleshootTestDescription.visibility = View.VISIBLE
+                views.troubleshootTestDescription.text = description
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
index e4d2571333..ab8af20063 100644
--- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
@@ -21,11 +21,9 @@ import android.content.Intent
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.annotation.CallSuper
-import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityVectorWebViewBinding
-
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 
@@ -48,7 +46,7 @@ class VectorWebViewActivity : VectorBaseActivity<ActivityVectorWebViewBinding>()
 
     override fun initUiAndData() {
         configureToolbar(views.webviewToolbar)
-        waitingView = findViewById(R.id.simple_webview_loader)
+        waitingView = views.simpleWebviewLoader
 
         views.simpleWebview.settings.apply {
             // Enable Javascript

From 582340cf8271d1afb9bfb4b2b0d58ba0c4497960 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 17 Jun 2021 09:49:10 +0200
Subject: [PATCH 49/49] Fix crash when setting up key backup

You must supply a layout_height/width attribute
---
 vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index bcc1de7d6a..c13175728f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -84,6 +84,8 @@
     <Button
         android:id="@+id/keys_backup_setup_step1_manual_export_button"
         style="@style/Widget.Vector.Button.Text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"