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