diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
index eb80afd3a1..870576b55e 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
@@ -13,13 +13,13 @@
         android:text="TextAppearance.Vector.Title\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Title.M"
+        style="@style/TextView.Vector.Title.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextAppearance.Vector.Title.M\nline 2" />
+        android:text="TextAppearance.Vector.Title.Medium\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
@@ -31,10 +31,10 @@
         android:text="TextAppearance.Vector.Subtitle\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Subtitle.M"
+        style="@style/TextView.Vector.Subtitle.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextAppearance.Vector.Subtitle.M\nline 2" />
+        android:text="TextAppearance.Vector.Subtitle.Medium\nline 2" />
 
     <TextView
         style="@style/TextView.Vector.Body"
@@ -43,10 +43,10 @@
         android:text="TextAppearance.Vector.Body\nline 2" />
 
     <TextView
-        style="@style/TextView.Vector.Body.M"
+        style="@style/TextView.Vector.Body.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextAppearance.Vector.Body.M\nline 2" />
+        android:text="TextAppearance.Vector.Body.Medium\nline 2" />
 
     <TextView
         style="@style/TextView.Vector.Caption"
diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
index bf44fd0245..2d54383b18 100644
--- a/library/ui-styles/src/main/res/values/styles_text_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -9,11 +9,11 @@
         <item name="lineHeight">32sp</item>
     </style>
 
-    <style name="TextView.Vector.Title.M">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Title.M</item>
+    <style name="TextView.Vector.Title.Medium">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Title.Medium</item>
     </style>
 
-    <style name="TextView.Vector.HeadlineM">
+    <style name="TextView.Vector.HeadlineMedium">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
     </style>
 
@@ -21,8 +21,8 @@
         <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
     </style>
 
-    <style name="TextView.Vector.Subtitle.M">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.M</item>
+    <style name="TextView.Vector.Subtitle.Medium">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.Medium</item>
     </style>
 
     <style name="TextView.Vector.Body">
@@ -30,8 +30,8 @@
         <item name="lineHeight">20sp</item>
     </style>
 
-    <style name="TextView.Vector.Body.M">
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.M</item>
+    <style name="TextView.Vector.Body.Medium">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
     </style>
 
     <style name="TextView.Vector.Caption">
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index a54c6a2258..d425708b9b 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -13,7 +13,7 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Title.M">
+    <style name="TextAppearance.Vector.Title.Medium">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
@@ -34,7 +34,7 @@
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Subtitle.M">
+    <style name="TextAppearance.Vector.Subtitle.Medium">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
@@ -48,7 +48,7 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="TextAppearance.Vector.Body.M">
+    <style name="TextAppearance.Vector.Body.Medium">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 440248b9df..ce674c1497 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -31,7 +31,7 @@
 
         <TextView
             android:id="@+id/bootstrapTitleText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
index 4870bdebb6..48b3df89b7 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
@@ -16,7 +16,7 @@
 
         <TextView
             android:id="@+id/callDialPadTitle"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
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 5e4874410a..139c469cfb 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -11,7 +11,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
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 5a65e41ba5..065d1d2a36 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
@@ -11,7 +11,7 @@
 
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 2189074749..59d2632d59 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -10,7 +10,7 @@
     android:paddingBottom="8dp">
 
     <TextView
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/keys_backup_setup_step3_copy_button_title"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 65b00219d3..676367edd5 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/otherUserNameText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index f79f5e86a0..f4adc3c3c2 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
-                style="@style/TextView.Vector.HeadlineM"
+                style="@style/TextView.Vector.HeadlineMedium"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index b2d49d26fe..b32ad45703 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/phoneBookTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
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 bdd02c3340..6d974793c5 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
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/createDirectRoomTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index 41678d7811..4eba062c80 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -40,7 +40,7 @@
 
                     <TextView
                         android:id="@+id/createRoomTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 529b213f16..dcca8fab50 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -77,7 +77,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarTitleView"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index cb0cce68c8..34f2d36ac5 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/success_text"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         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 932c7f73da..c0e1882382 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_title"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
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 7319471f1e..0ee222acac 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
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_title"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 8ab6561a7d..d4c29702cb 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 8345c58acb..4e1e49ede3 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -71,7 +71,7 @@
 
                     <TextView
                         android:id="@+id/matrixProfileToolbarTitleView"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
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 cabde658b6..a6d807d873 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -37,7 +37,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 5d8b6c6cbb..316f406ef1 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
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 9cba9a955f..4ae28b1f77 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
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 7f3deaecd0..b023ddfb7e 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/roomSettingsToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index f4939d0341..b8874218ab 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -46,7 +46,7 @@
 
                 <TextView
                     android:id="@+id/roomUploadsToolbarTitleView"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
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 61af81f572..aa97382f49 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -35,7 +35,7 @@
 
                 <TextView
                     android:id="@+id/appBarTitle"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index 5bbb4d9bd0..c1dc2e313d 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,7 +13,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index d378558a1e..352b595762 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -41,7 +41,7 @@
 
                     <TextView
                         android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index 13efd49c40..5ed6f458b2 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
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 7ea7b64c9a..df0a252240 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
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -98,7 +98,7 @@
 
         <TextView
             android:id="@+id/ssss_passphrase_or"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
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 5004bb17d3..2b69b5f522 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/reset_title"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
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 b09f3a3d2f..48163f80f2 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -39,7 +39,7 @@
 
                     <TextView
                         android:id="@+id/showUserCodeTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 58630f9149..1a7159ded4 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -43,7 +43,7 @@
 
                     <TextView
                         android:id="@+id/userDirectoryTitle"
-                        style="@style/TextView.Vector.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineMedium"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 3cc2dd2c35..5e4d2f3e10 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -38,7 +38,7 @@
 
                 <TextView
                     android:id="@+id/userListTitle"
-                    style="@style/TextView.Vector.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineMedium"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
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 eed9407557..d5035fda4e 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleTitle"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index fd7474d93f..9af8a09e7d 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemHelpText"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index cc80dc8f0b..1ba229f211 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKind"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
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 d7f5ac2164..c59cee112b 100644
--- a/vector/src/main/res/layout/item_room_alias_text_input.xml
+++ b/vector/src/main/res/layout/item_room_alias_text_input.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHash"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/itemRoomAliasHomeServer"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
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 369977f6ab..e888026e03 100644
--- a/vector/src/main/res/layout/item_settings_section_title.xml
+++ b/vector/src/main/res/layout/item_settings_section_title.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_section_title_text"
-    style="@style/TextView.Vector.HeadlineM"
+    style="@style/TextView.Vector.HeadlineMedium"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?vctr_header_background"
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 8d241ec46c..46c19259b9 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoKey"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index 754f370315..9c6042c1e7 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userDirectoryLetterView"
-    style="@style/TextView.Vector.HeadlineM"
+    style="@style/TextView.Vector.HeadlineMedium"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index 6360412657..3de79698ad 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userListHeaderView"
-    style="@style/TextView.Vector.HeadlineM"
+    style="@style/TextView.Vector.HeadlineMedium"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
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 f26625888b..400f017bc5 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_1"
-        style="@style/TextView.Vector.HeadlineM"
+        style="@style/TextView.Vector.HeadlineMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
diff --git a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
index a4da54f04f..d8ee1ddca9 100644
--- a/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_sign_out_bottom_sheet_action_button.xml
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/actionTitleText"
-            style="@style/TextView.Vector.HeadlineM"
+            style="@style/TextView.Vector.HeadlineMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"