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