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] 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>