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

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

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