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

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

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