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 6ff0d68078..ab7a33f258 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/videoMediaViewerErrorView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index 8010786a17..47c4664636 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -58,4 +58,6 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
     // PFLockScreen attrs
     implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
+    // dialpad dimen
+    implementation 'im.dlg:android-dialer:1.2.5'
 }
\ No newline at end of file
diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
index 1d10d3fb49..7d251b8af7 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
@@ -12,100 +12,100 @@
         android:orientation="vertical"
         android:padding="16dp">
 
-        <!-- Note: Default style is @style/VectorButtonStyle in the theme -->
+        <!-- Note: Default style is @style/Button.Vector.Style in the theme -->
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Button.Vector.Style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Default" />
 
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Button.Vector.Style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Line1\nLine 2" />
 
         <Button
-            style="@style/VectorButtonStyle"
+            style="@style/Button.Vector.Style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Default disabled" />
 
         <Button
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Text" />
 
         <Button
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Text disabled" />
 
         <Button
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Positive" />
 
         <Button
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Positive disabled" />
 
         <Button
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Destructive" />
 
         <Button
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Destructive disabled" />
 
         <Button
-            style="@style/VectorButtonStyleUnelevated.Bot"
+            style="@style/Button.Vector.Style.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Bot" />
 
         <Button
-            style="@style/VectorButtonStyleUnelevated.Bot"
+            style="@style/Button.Vector.Style.Unelevated.Bot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Bot disabled" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined"
+            style="@style/Button.Vector.Style.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
             android:text="Outline" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined"
+            style="@style/Button.Vector.Style.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
             android:text="Outline disabled" />
 
         <Button
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Button.Vector.Style.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Poll " />
 
         <Button
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Button.Vector.Style.Outlined.Poll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
@@ -119,14 +119,14 @@
             android:padding="8dp">
 
             <Button
-                style="@style/AlerterButton"
+                style="@style/Button.Vector.Style.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="Alerter" />
 
             <Button
-                style="@style/AlerterButton"
+                style="@style/Button.Vector.Style.Text.Alerter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="false"
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 7e922fe741..eb80afd3a1 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
@@ -7,62 +7,62 @@
     tools:ignore="HardcodedText">
 
     <TextView
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceTitle\nline 2" />
+        android:text="TextAppearance.Vector.Title\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Title.M"
+        style="@style/TextView.Vector.Title.M"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceTitle.M\nline 2" />
+        android:text="TextAppearance.Vector.Title.M\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceHeadlineM\nline 2" />
+        android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceSubtitle\nline 2" />
+        android:text="TextAppearance.Vector.Subtitle\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle.M"
+        style="@style/TextView.Vector.Subtitle.M"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceSubtitle.M\nline 2" />
+        android:text="TextAppearance.Vector.Subtitle.M\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceBody\nline 2" />
+        android:text="TextAppearance.Vector.Body\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Body.M"
+        style="@style/TextView.Vector.Body.M"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceBody.M\nline 2" />
+        android:text="TextAppearance.Vector.Body.M\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceCaption\nline 2" />
+        android:text="TextAppearance.Vector.Caption\nline 2" />
 
     <TextView
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="VectorTextAppearanceMicro\nline 2" />
+        android:text="TextAppearance.Vector.Micro\nline 2" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Default (VectorTextAppearanceBody)\nline 2" />
+        android:text="Default (TextAppearance.Vector.Body)\nline 2" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml b/library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
similarity index 100%
rename from vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
rename to library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
diff --git a/vector/src/main/res/color/button_background_tint_selector.xml b/library/ui-styles/src/main/res/color/button_background_tint_selector.xml
similarity index 100%
rename from vector/src/main/res/color/button_background_tint_selector.xml
rename to library/ui-styles/src/main/res/color/button_background_tint_selector.xml
diff --git a/vector/src/main/res/color/button_social_google_background_selector_dark.xml b/library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
similarity index 100%
rename from vector/src/main/res/color/button_social_google_background_selector_dark.xml
rename to library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
diff --git a/vector/src/main/res/color/button_social_google_background_selector_light.xml b/library/ui-styles/src/main/res/color/button_social_google_background_selector_light.xml
similarity index 100%
rename from vector/src/main/res/color/button_social_google_background_selector_light.xml
rename to library/ui-styles/src/main/res/color/button_social_google_background_selector_light.xml
diff --git a/vector/src/main/res/color/color_primary_alpha25.xml b/library/ui-styles/src/main/res/color/color_primary_alpha25.xml
similarity index 100%
rename from vector/src/main/res/color/color_primary_alpha25.xml
rename to library/ui-styles/src/main/res/color/color_primary_alpha25.xml
diff --git a/vector/src/main/res/drawable/bg_bottom_navigation.xml b/library/ui-styles/src/main/res/drawable/bg_bottom_navigation.xml
similarity index 100%
rename from vector/src/main/res/drawable/bg_bottom_navigation.xml
rename to library/ui-styles/src/main/res/drawable/bg_bottom_navigation.xml
diff --git a/vector/src/main/res/drawable/bg_pin_key.xml b/library/ui-styles/src/main/res/drawable/bg_pin_key.xml
similarity index 100%
rename from vector/src/main/res/drawable/bg_pin_key.xml
rename to library/ui-styles/src/main/res/drawable/bg_pin_key.xml
diff --git a/vector/src/main/res/drawable/element_logo_green.xml b/library/ui-styles/src/main/res/drawable/element_logo_green.xml
similarity index 100%
rename from vector/src/main/res/drawable/element_logo_green.xml
rename to library/ui-styles/src/main/res/drawable/element_logo_green.xml
diff --git a/vector/src/main/res/drawable/file_progress_bar.xml b/library/ui-styles/src/main/res/drawable/file_progress_bar.xml
similarity index 100%
rename from vector/src/main/res/drawable/file_progress_bar.xml
rename to library/ui-styles/src/main/res/drawable/file_progress_bar.xml
diff --git a/vector/src/main/res/drawable/ic_search.xml b/library/ui-styles/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_search.xml
rename to library/ui-styles/src/main/res/drawable/ic_search.xml
diff --git a/vector/src/main/res/drawable/ic_social_apple.xml b/library/ui-styles/src/main/res/drawable/ic_social_apple.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_apple.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_apple.xml
diff --git a/vector/src/main/res/drawable/ic_social_facebook.xml b/library/ui-styles/src/main/res/drawable/ic_social_facebook.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_facebook.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_facebook.xml
diff --git a/vector/src/main/res/drawable/ic_social_github.xml b/library/ui-styles/src/main/res/drawable/ic_social_github.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_github.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_github.xml
diff --git a/vector/src/main/res/drawable/ic_social_gitlab.xml b/library/ui-styles/src/main/res/drawable/ic_social_gitlab.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_gitlab.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_gitlab.xml
diff --git a/vector/src/main/res/drawable/ic_social_google.xml b/library/ui-styles/src/main/res/drawable/ic_social_google.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_google.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_google.xml
diff --git a/vector/src/main/res/drawable/ic_social_twitter.xml b/library/ui-styles/src/main/res/drawable/ic_social_twitter.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_social_twitter.xml
rename to library/ui-styles/src/main/res/drawable/ic_social_twitter.xml
diff --git a/vector/src/main/res/drawable/ic_x_gray.xml b/library/ui-styles/src/main/res/drawable/ic_x_gray.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_x_gray.xml
rename to library/ui-styles/src/main/res/drawable/ic_x_gray.xml
diff --git a/vector/src/main/res/drawable/pin_code_dot_empty.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
similarity index 100%
rename from vector/src/main/res/drawable/pin_code_dot_empty.xml
rename to library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
diff --git a/vector/src/main/res/drawable/pin_code_dot_fill.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
similarity index 100%
rename from vector/src/main/res/drawable/pin_code_dot_fill.xml
rename to library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
diff --git a/vector/src/main/res/drawable/pin_code_dots.xml b/library/ui-styles/src/main/res/drawable/pin_code_dots.xml
similarity index 100%
rename from vector/src/main/res/drawable/pin_code_dots.xml
rename to library/ui-styles/src/main/res/drawable/pin_code_dots.xml
diff --git a/vector/src/main/res/drawable/vector_label_background.xml b/library/ui-styles/src/main/res/drawable/vector_label_background.xml
similarity index 100%
rename from vector/src/main/res/drawable/vector_label_background.xml
rename to library/ui-styles/src/main/res/drawable/vector_label_background.xml
diff --git a/library/ui-styles/src/main/res/values/style_snackbar.xml b/library/ui-styles/src/main/res/values/style_snackbar.xml
index 60c78c0e65..d1c7319813 100644
--- a/library/ui-styles/src/main/res/values/style_snackbar.xml
+++ b/library/ui-styles/src/main/res/values/style_snackbar.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorSnackBarStyle" parent="@style/Widget.MaterialComponents.Snackbar">
+    <style name="SnackBar.Vector.Style" parent="@style/Widget.MaterialComponents.Snackbar">
 <!--        <item name="android:background">@color/notification_accent_color</item>-->
     </style>
 
-    <style name="VectorSnackBarButton" parent="@style/VectorButtonStyleText.OnPrimary">
+    <style name="SnackBar.Vector.Button" parent="@style/Button.Vector.Style.Text.OnPrimary">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 
-    <style name="VectorSnackBarText" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+    <style name="SnackBar.Vector.Text" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
 <!--        <item name="android:textColor">@color/white</item>-->
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/styles.xml b/library/ui-styles/src/main/res/values/styles.xml
index 8cc1fe70d8..b028d2e219 100644
--- a/library/ui-styles/src/main/res/values/styles.xml
+++ b/library/ui-styles/src/main/res/values/styles.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Vector.PopupMenu" parent="Vector.PopupMenuBase" />
-
     <style name="VectorEmptyImageView">
         <item name="android:visibility">visible</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_alert_dialog.xml b/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
index 08ce9d4dda..283a1ab1ca 100644
--- a/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
+++ b/library/ui-styles/src/main/res/values/styles_alert_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorAlertDialogStyleLight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="AlertDialog.Vector.Light" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="colorPrimary">@color/palette_element_green</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_system_light</item>
@@ -13,7 +13,7 @@
         <item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
     </style>
 
-    <style name="VectorAlertDialogStyleDark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+    <style name="AlertDialog.Vector.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="colorPrimary">@color/palette_element_green</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_system_dark</item>
diff --git a/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml b/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
index ddd5e7d30a..8925d6a74f 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorBottomNavigation" parent="Widget.MaterialComponents.BottomNavigationView">
+    <style name="BottomNavigation.Vector" parent="Widget.MaterialComponents.BottomNavigationView">
         <item name="android:background">@drawable/bg_bottom_navigation</item>
         <item name="itemBackground">@drawable/bg_bottom_navigation</item>
         <item name="itemIconSize">20dp</item>
diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index f244a80969..8d1511f405 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <!-- BottomSheet theming -->
-    <style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+    <style name="BottomSheet.Vector.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_light</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_light</item>
@@ -13,7 +13,7 @@
         <item name="android:textColorLink">@color/element_link_light</item>
     </style>
 
-    <style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
+    <style name="BottomSheet.Vector.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_dark</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_dark</item>
@@ -24,7 +24,7 @@
         <item name="android:textColorLink">@color/element_link_dark</item>
     </style>
 
-    <style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
+    <style name="BottomSheet.Vector.Black" parent="BottomSheet.Vector.Dark">
         <item name="colorSurface">@color/element_background_black</item>
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
index a8c2508c25..3d779fe115 100644
--- a/library/ui-styles/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorButtonStyle" parent="Widget.MaterialComponents.Button">
+    <style name="Button.Vector.Style" parent="Widget.MaterialComponents.Button">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyle.Destructive">
+    <style name="Button.Vector.Style.Destructive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
     </style>
@@ -18,7 +18,7 @@
         <item name="colorPrimary">?colorError</item>
     </style>
 
-    <style name="VectorButtonStyle.Positive">
+    <style name="Button.Vector.Style.Positive">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
     </style>
@@ -27,15 +27,15 @@
         <!-- Keep default colors from the theme -->
     </style>
 
-    <style name="VectorButtonStyleUnelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+    <style name="Button.Vector.Style.Unelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyleUnelevated.Bot">
+    <style name="Button.Vector.Style.Unelevated.Bot">
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayBot</item>
     </style>
 
@@ -44,27 +44,27 @@
         <item name="colorOnPrimary">@color/button_bot_enabled_text_color</item>
     </style>
 
-    <style name="VectorButtonStyleText" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Button.Vector.Style.Text" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="colorControlHighlight">?colorSecondary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="VectorButtonStyleText.OnPrimary">
+    <style name="Button.Vector.Style.Text.OnPrimary">
         <item name="colorControlHighlight">?colorOnPrimary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
     </style>
 
-    <style name="VectorButtonStyleOutlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Button.Vector.Style.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textAllCaps">false</item>
         <item name="strokeColor">@color/button_background_tint_selector</item>
         <item name="strokeWidth">1dp</item>
-        <item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="AlerterButton" parent="VectorButtonStyleText">
+    <style name="Button.Vector.Style.Text.Alerter">
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">false</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
@@ -74,7 +74,7 @@
         <item name="colorPrimary">?colorOnPrimary</item>
     </style>
 
-    <style name="VectorButtonStyleOutlined.Poll">
+    <style name="Button.Vector.Style.Outlined.Poll">
         <item name="android:minHeight">44dp</item>
         <item name="cornerRadius">10dp</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
index 586e77ffe7..f0703135fa 100644
--- a/library/ui-styles/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -2,9 +2,9 @@
 <resources>
 
     <!-- Default style for TextInputLayout -->
-    <style name="VectorTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
+    <style name="TextInputLayout.Vector" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
 
-    <style name="ComposerEditTextStyle" parent="Widget.AppCompat.EditText">
+    <style name="EditText.Vector.Composer" parent="Widget.AppCompat.EditText">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
         <item name="android:maxLines">12</item>
@@ -14,10 +14,4 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
-    <!-- Styles for login screen -->
-    <style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
-        <item name="android:textSize">16sp</item>
-    </style>
-
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_login.xml b/library/ui-styles/src/main/res/values/styles_login.xml
index 8cba34daf3..a5293dcb66 100644
--- a/library/ui-styles/src/main/res/values/styles_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_login.xml
@@ -35,17 +35,17 @@
         <item name="android:paddingBottom">32dp</item>
     </style>
 
-    <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
+    <style name="Button.Vector.Style.Login">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
+    <style name="Button.Vector.Style.Login.Outlined" parent="Button.Vector.Style.Outlined">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Text" parent="VectorButtonStyleText">
+    <style name="Button.Vector.Style.Login.Text" parent="Button.Vector.Style.Text">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_pin_code.xml b/library/ui-styles/src/main/res/values/styles_pin_code.xml
index 61f53ab522..11ededa2f0 100644
--- a/library/ui-styles/src/main/res/values/styles_pin_code.xml
+++ b/library/ui-styles/src/main/res/values/styles_pin_code.xml
@@ -15,7 +15,7 @@
         <item name="android:button">@drawable/pin_code_dots</item>
     </style>
 
-    <style name="PinCodeNextButtonStyle" parent="VectorButtonStyle">
+    <style name="PinCodeNextButtonStyle" parent="Button.Vector.Style">
         <item name="android:textSize">18sp</item>
         <item name="android:backgroundTint">@android:color/transparent</item>
         <item name="android:layout_marginBottom">24dp</item>
diff --git a/library/ui-styles/src/main/res/values/styles_popup.xml b/library/ui-styles/src/main/res/values/styles_popup.xml
index dbc292b8c8..c7b089e94c 100644
--- a/library/ui-styles/src/main/res/values/styles_popup.xml
+++ b/library/ui-styles/src/main/res/values/styles_popup.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Vector.PopupMenuBase" parent="Widget.AppCompat.PopupMenu">
+    <style name="PopupMenu.Vector.Base" parent="Widget.AppCompat.PopupMenu">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:textSize">16sp</item>
         <item name="android:dropDownHorizontalOffset">0dp</item>
         <item name="android:dropDownVerticalOffset">0dp</item>
     </style>
 
+    <style name="PopupMenu.Vector" parent="PopupMenu.Vector.Base" />
+
+
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_progress.xml b/library/ui-styles/src/main/res/values/styles_progress.xml
index 73e8a075e1..fa976f3ba7 100644
--- a/library/ui-styles/src/main/res/values/styles_progress.xml
+++ b/library/ui-styles/src/main/res/values/styles_progress.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="FileProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
+    <style name="ProgressBar.Vector.File" parent="Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:indeterminateOnly">false</item>
         <item name="android:progressDrawable">@drawable/file_progress_bar</item>
         <item name="android:minHeight">10dp</item>
         <item name="android:maxHeight">40dp</item>
     </style>
 
-    <style name="VectorHorizontalProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
+    <style name="ProgressBar.Vector.Horizontal" parent="Widget.AppCompat.ProgressBar.Horizontal" />
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_search_view.xml b/library/ui-styles/src/main/res/values/styles_search_view.xml
index 5cf6db538f..a714b1aac2 100644
--- a/library/ui-styles/src/main/res/values/styles_search_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_search_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
+    <style name="SearchView.Vector" parent="Widget.AppCompat.SearchView">
         <item name="searchIcon">@drawable/ic_search</item>
         <item name="closeIcon">@drawable/ic_x_gray</item>
         <item name="iconifiedByDefault">false</item>
diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index 04a15566de..dd662eb3ba 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="WidgetButtonSocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Button.Vector.SocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textAllCaps">false</item>
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:layout_width">wrap_content</item>
@@ -17,44 +17,44 @@
         <item name="strokeColor">@color/black_54</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Google">
+    <style name="Button.Vector.SocialLogin.Google">
         <item name="icon">@drawable/ic_social_google</item>
         <item name="iconTint">@android:color/transparent</item>
         <item name="iconTintMode">add</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Google.Light">
+    <style name="Button.Vector.SocialLogin.Google.Light">
         <item name="android:backgroundTint">@color/button_social_google_background_selector_light</item>
         <item name="android:textColor">@color/black_54</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Google.Dark">
+    <style name="Button.Vector.SocialLogin.Google.Dark">
         <item name="android:backgroundTint">@color/button_social_google_background_selector_dark</item>
         <item name="android:textColor">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Github" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Github">
         <item name="icon">@drawable/ic_social_github</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Github.Light">
+    <style name="Button.Vector.SocialLogin.Github.Light">
         <item name="iconTint">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Github.Dark">
+    <style name="Button.Vector.SocialLogin.Github.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
 
-    <style name="WidgetButtonSocialLogin.Facebook" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Facebook">
         <item name="icon">@drawable/ic_social_facebook</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Facebook.Light">
+    <style name="Button.Vector.SocialLogin.Facebook.Light">
         <item name="strokeColor">#3877EA</item>
         <item name="strokeWidth">1dp</item>
         <item name="iconTint">#3877EA</item>
@@ -62,58 +62,58 @@
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Facebook.Dark">
+    <style name="Button.Vector.SocialLogin.Facebook.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">#3877EA</item>
     </style>
 
 
-    <style name="WidgetButtonSocialLogin.Twitter" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Twitter">
         <item name="icon">@drawable/ic_social_twitter</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Twitter.Light">
+    <style name="Button.Vector.SocialLogin.Twitter.Light">
         <item name="iconTint">#5D9EC9</item>
         <item name="android:textColor">#5D9EC9</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Twitter.Dark">
+    <style name="Button.Vector.SocialLogin.Twitter.Dark">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">#5D9EC9</item>
     </style>
 
 
-    <style name="WidgetButtonSocialLogin.Apple" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Apple">
         <item name="icon">@drawable/ic_social_apple</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Apple.Light">
+    <style name="Button.Vector.SocialLogin.Apple.Light">
         <item name="iconTint">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Apple.Dark">
+    <style name="Button.Vector.SocialLogin.Apple.Dark">
         <item name="iconTint">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Gitlab" parent="WidgetButtonSocialLogin">
+    <style name="Button.Vector.SocialLogin.Gitlab">
         <item name="icon">@drawable/ic_social_gitlab</item>
         <item name="iconTint">@android:color/transparent</item>
         <item name="iconTintMode">add</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Gitlab.Light">
+    <style name="Button.Vector.SocialLogin.Gitlab.Light">
         <item name="android:textColor">@android:color/black</item>
         <item name="android:backgroundTint">@android:color/white</item>
     </style>
 
-    <style name="WidgetButtonSocialLogin.Gitlab.Dark">
+    <style name="Button.Vector.SocialLogin.Gitlab.Dark">
         <item name="android:textColor">@android:color/white</item>
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
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 59bea680fe..bf44fd0245 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
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorTextView" parent="Widget.MaterialComponents.TextView" />
+    <style name="TextView.Vector" parent="Widget.MaterialComponents.TextView" />
 
     <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
-    <style name="VectorTextView.Title">
-        <item name="android:textAppearance">@style/VectorTextAppearanceTitle</item>
+    <style name="TextView.Vector.Title">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
         <item name="lineHeight">32sp</item>
     </style>
 
-    <style name="VectorTextView.Title.M">
-        <item name="android:textAppearance">@style/VectorTextAppearanceTitle.M</item>
+    <style name="TextView.Vector.Title.M">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Title.M</item>
     </style>
 
-    <style name="VectorTextView.HeadlineM">
-        <item name="android:textAppearance">@style/VectorTextAppearanceHeadlineM</item>
+    <style name="TextView.Vector.HeadlineM">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
     </style>
 
-    <style name="VectorTextView.Subtitle">
-        <item name="android:textAppearance">@style/VectorTextAppearanceSubtitle</item>
+    <style name="TextView.Vector.Subtitle">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
     </style>
 
-    <style name="VectorTextView.Subtitle.M">
-        <item name="android:textAppearance">@style/VectorTextAppearanceSubtitle.M</item>
+    <style name="TextView.Vector.Subtitle.M">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.M</item>
     </style>
 
-    <style name="VectorTextView.Body">
-        <item name="android:textAppearance">@style/VectorTextAppearanceBody</item>
+    <style name="TextView.Vector.Body">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
         <item name="lineHeight">20sp</item>
     </style>
 
-    <style name="VectorTextView.Body.M">
-        <item name="android:textAppearance">@style/VectorTextAppearanceBody.M</item>
+    <style name="TextView.Vector.Body.M">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.M</item>
     </style>
 
-    <style name="VectorTextView.Caption">
-        <item name="android:textAppearance">@style/VectorTextAppearanceCaption</item>
+    <style name="TextView.Vector.Caption">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
         <item name="lineHeight">16sp</item>
     </style>
 
-    <style name="VectorTextView.Micro">
-        <item name="android:textAppearance">@style/VectorTextAppearanceMicro</item>
+    <style name="TextView.Vector.Micro">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
         <item name="lineHeight">16sp</item>
     </style>
 
diff --git a/library/ui-styles/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
index 3131148996..ab18abfdab 100644
--- a/library/ui-styles/src/main/res/values/styles_toolbar.xml
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorAppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
+    <style name="AppBarLayout.Vector.Style" parent="Widget.MaterialComponents.AppBarLayout.Primary">
         <item name="android:background">?vctr_toolbar_background</item>
         <item name="elevation">4dp</item>
     </style>
 
-    <style name="VectorToolbarBase" parent="Widget.MaterialComponents.Toolbar">
+    <style name="Toolbar.Vector.Base" parent="Widget.MaterialComponents.Toolbar">
         <item name="android:background">?vctr_toolbar_background</item>
         <item name="elevation">0dp</item>
 
         <!-- main text -->
-        <item name="titleTextStyle">@style/ActionBarTitleText</item>
+        <item name="titleTextStyle">@style/TextView.Vector.ActrionBarTitle</item>
 
         <!-- sub text -->
-        <item name="subtitleTextStyle">@style/ActionBarSubTitleText</item>
+        <item name="subtitleTextStyle">@style/TextView.Vector.ActrionBarSubTitle</item>
     </style>
 
     <!-- Default toolbar style -->
-    <style name="VectorToolbar" parent="VectorToolbarBase">
+    <style name="Toolbar.Vector" parent="Toolbar.Vector.Base">
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>
 
     <!-- Toolbar for settings Activity (so we keep the default contentInsetStartWithNavigation here) -->
-    <style name="VectorToolbarSettings" parent="VectorToolbarBase" />
+    <style name="Toolbar.Vector.Settings" parent="Toolbar.Vector.Base" />
 
     <!-- Toolbar text style -->
     <!-- main text -->
-    <style name="ActionBarTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+    <style name="TextView.Vector.ActrionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:fontFamily">"sans-serif-medium"</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <!-- sub text -->
-    <style name="ActionBarSubTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
+    <style name="TextView.Vector.ActrionBarSubTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
         <item name="android:textColor">?vctr_content_primary</item>
         <item name="android:fontFamily">"sans-serif-medium"</item>
         <item name="android:textSize">12sp</item>
     </style>
 
     <!-- Action mode style -->
-    <style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
+    <style name="ActionMode.Vector.Style" parent="Widget.AppCompat.ActionMode">
         <item name="background">?android:colorBackground</item>
-        <item name="titleTextStyle">@style/VectorTextView.Title</item>
-        <item name="subtitleTextStyle">@style/VectorTextView.Subtitle</item>
+        <item name="titleTextStyle">@style/TextView.Vector.Title</item>
+        <item name="subtitleTextStyle">@style/TextView.Vector.Subtitle</item>
         <item name="actionMenuTextColor">?colorOnPrimary</item>
     </style>
 
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 e938cb5a98..a54c6a2258 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -5,7 +5,7 @@
       List of supported attributes for a TextAppearance:
       https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723-->
 
-    <style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
+    <style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">24sp</item>
@@ -13,12 +13,12 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="VectorTextAppearanceTitle.M">
+    <style name="TextAppearance.Vector.Title.M">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="VectorTextAppearanceHeadlineM" parent="TextAppearance.MaterialComponents.Headline1">
+    <style name="TextAppearance.Vector.Headline.Medium" parent="TextAppearance.MaterialComponents.Headline1">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">18sp</item>
@@ -26,7 +26,7 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="VectorTextAppearanceSubtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
+    <style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">16sp</item>
@@ -34,13 +34,13 @@
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="VectorTextAppearanceSubtitle.M">
+    <style name="TextAppearance.Vector.Subtitle.M">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <!-- Note: this is the default text appearance for all the TextViews -->
-    <style name="VectorTextAppearanceBody" parent="TextAppearance.MaterialComponents.Body1">
+    <style name="TextAppearance.Vector.Body" parent="TextAppearance.MaterialComponents.Body1">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">14sp</item>
@@ -48,12 +48,12 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-    <style name="VectorTextAppearanceBody.M">
+    <style name="TextAppearance.Vector.Body.M">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
-    <style name="VectorTextAppearanceCaption" parent="TextAppearance.MaterialComponents.Caption">
+    <style name="TextAppearance.Vector.Caption" parent="TextAppearance.MaterialComponents.Caption">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">12sp</item>
@@ -61,14 +61,14 @@
         <item name="android:textColor">?vctr_content_secondary</item>
     </style>
 
-    <style name="VectorTextAppearanceMicro" parent="TextAppearance.MaterialComponents.Caption">
+    <style name="TextAppearance.Vector.Micro" parent="TextAppearance.MaterialComponents.Caption">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">10sp</item>
         <item name="android:letterSpacing">0</item>
     </style>
 
-    <style name="VectorTextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
+    <style name="TextAppearance.Vector.Button" parent="TextAppearance.MaterialComponents.Button">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">16sp</item>
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index 98ab4213c3..0cce560b52 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -25,7 +25,7 @@
         <item name="colorSurface">@android:color/black</item>
         <item name="android:colorBackground">@color/element_background_black</item>
 
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Black</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Black</item>
 
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:navigationBarColor">@android:color/black</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 741a76afca..a5188131b2 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -63,30 +63,30 @@
         <item name="colorOnBackground">?vctr_content_primary</item>
 
         <!--Material type attributes-->
-        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
-        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <item name="textAppearanceButton">@style/TextAppearance.Vector.Button</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
         <!-- Default Text appearance for TextViews -->
-        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
         <!-- Text appearance for List item (TODO Check that this is used in Preference Screen -->
-        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
-        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
-        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
+        <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/VectorTextView.Body</item>
-        <item name="materialButtonStyle">@style/VectorButtonStyle</item>
-        <item name="toolbarStyle">@style/VectorToolbar</item>
-        <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
-        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
-        <item name="searchViewStyle">@style/VectorSearchView</item>
-        <item name="textInputStyle">@style/VectorTextInputLayout</item>
-        <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-        <item name="actionModeStyle">@style/VectorActionMode</item>
+        <item name="android:textViewStyle">@style/TextView.Vector.Body</item>
+        <item name="materialButtonStyle">@style/Button.Vector.Style</item>
+        <item name="toolbarStyle">@style/Toolbar.Vector</item>
+        <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Dark</item>
+        <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
+        <item name="searchViewStyle">@style/SearchView.Vector</item>
+        <item name="textInputStyle">@style/TextInputLayout.Vector</item>
+        <item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Vector</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Dark</item>
+        <item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
+        <item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
+        <item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
+        <item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
 
         <item name="android:textColorLink">@color/element_link_dark</item>
 
@@ -124,12 +124,12 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/WidgetButtonSocialLogin.Google.Dark</item>
-        <item name="vctr_social_login_button_github_style">@style/WidgetButtonSocialLogin.Github.Dark</item>
-        <item name="vctr_social_login_button_facebook_style">@style/WidgetButtonSocialLogin.Facebook.Dark</item>
-        <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Dark</item>
-        <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Dark</item>
-        <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Dark</item>
+        <item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Dark</item>
+        <item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Dark</item>
+        <item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Dark</item>
+        <item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Dark</item>
+        <item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Dark</item>
+        <item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Dark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 6047278ad2..d2c659a599 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -63,30 +63,30 @@
         <item name="colorOnBackground">?vctr_content_primary</item>
 
         <!--Material type attributes-->
-        <item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
-        <item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
+        <item name="textAppearanceButton">@style/TextAppearance.Vector.Button</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
         <!-- Default Text appearance for TextViews -->
-        <item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
+        <item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
         <!-- Text appearance for List item -->
-        <item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
-        <item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
-        <item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
+        <item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
+        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
+        <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
 
         <!-- Default styles -->
-        <item name="android:textViewStyle">@style/VectorTextView.Body</item>
-        <item name="materialButtonStyle">@style/VectorButtonStyle</item>
-        <item name="toolbarStyle">@style/VectorToolbar</item>
-        <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>
-        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
-        <item name="searchViewStyle">@style/VectorSearchView</item>
-        <item name="textInputStyle">@style/VectorTextInputLayout</item>
-        <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-        <item name="actionModeStyle">@style/VectorActionMode</item>
+        <item name="android:textViewStyle">@style/TextView.Vector.Body</item>
+        <item name="materialButtonStyle">@style/Button.Vector.Style</item>
+        <item name="toolbarStyle">@style/Toolbar.Vector</item>
+        <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Light</item>
+        <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
+        <item name="searchViewStyle">@style/SearchView.Vector</item>
+        <item name="textInputStyle">@style/TextInputLayout.Vector</item>
+        <item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Vector</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Light</item>
+        <item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
+        <item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
+        <item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
+        <item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
 
         <item name="android:textColorLink">@color/element_link_light</item>
 
@@ -126,12 +126,12 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/WidgetButtonSocialLogin.Google.Light</item>
-        <item name="vctr_social_login_button_github_style">@style/WidgetButtonSocialLogin.Github.Light</item>
-        <item name="vctr_social_login_button_facebook_style">@style/WidgetButtonSocialLogin.Facebook.Light</item>
-        <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Light</item>
-        <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Light</item>
-        <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Light</item>
+        <item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Light</item>
+        <item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Light</item>
+        <item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Light</item>
+        <item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Light</item>
+        <item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Light</item>
+        <item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Light</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
index dbbd7270d7..838269f156 100644
--- a/tools/check/forbidden_strings_in_layout.txt
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -23,5 +23,5 @@
 
 # Extension:xml
 
-### Use style="@style/VectorTextView.*" instead of textSize attribute
+### Use style="@style/TextView.Vector.*" instead of textSize attribute
 android:textSize===9
diff --git a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
index 168faae1a3..88ea941b15 100644
--- a/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
+++ b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/message"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="${fragmentClass}"
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index ee2f068f1e..3c77c70408 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/sas_emoji_index"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="32dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/sas_emoji"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/sas_emoji_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/sas_emoji_text_id"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 3228ffa6e1..3c4e233c7c 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -231,7 +231,7 @@ class PopupAlertManager @Inject constructor() {
                         setIcon(it)
                     }
                     alert.actions.forEach { action ->
-                        addButton(action.title, R.style.AlerterButton) {
+                        addButton(action.title, R.style.Button_Vector_Style_Text_Alerter) {
                             if (action.autoClose) {
                                 currentIsDismissed()
                                 Alerter.hide()
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index c59627454a..46f3347391 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/bug_report_progress_text_view"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -64,7 +64,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_first_text"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -93,7 +93,7 @@
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
@@ -103,7 +103,7 @@
 
                 <TextView
                     android:id="@+id/bug_report_logs_description"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.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.xml b/vector/src/main/res/layout/activity_call.xml
index aa84e01e06..cb8b2f3b7c 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -98,7 +98,7 @@
 
     <TextView
         android:id="@+id/participantNameText"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -114,7 +114,7 @@
 
     <TextView
         android:id="@+id/callStatusText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -130,7 +130,7 @@
 
     <Button
         android:id="@+id/callActionText"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_margin="8dp"
diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml
index ee3833b241..bd4b7bcfca 100644
--- a/vector/src/main/res/layout/activity_call_transfer.xml
+++ b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -60,7 +60,7 @@
 
             <TextView
                 android:id="@+id/callTransferConsultTitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -72,7 +72,7 @@
 
             <Button
                 android:id="@+id/callTransferConnectAction"
-                style="@style/VectorButtonStyleText"
+                style="@style/Button.Vector.Style.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml
index 1f50dd55a2..1cb6cf47a2 100644
--- a/vector/src/main/res/layout/activity_signed_out.xml
+++ b/vector/src/main/res/layout/activity_signed_out.xml
@@ -17,14 +17,14 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/signed_out_title"
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <Button
                 android:id="@+id/signedOutSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index f664d4c60d..a6a722e576 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -15,10 +15,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <!-- Use VectorToolbarSettings on this screen for better alignment with setting items -->
+            <!-- Use Toolbar.Vector.Settings on this screen for better alignment with setting items -->
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/settingsToolbar"
-                style="@style/VectorToolbarSettings"
+                style="@style/Toolbar.Vector.Settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:navigationIcon="@drawable/ic_back_24dp"
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index e0fae2741b..c29a08c690 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/incomingCallNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/incomingCallKindView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 2b484dc4ee..ed47759c83 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -44,7 +44,7 @@
 
         <TextView
             android:id="@+id/tvTitle"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
@@ -58,7 +58,7 @@
 
         <TextView
             android:id="@+id/tvText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/alerter_padding_half"
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 512e596fc8..440248b9df 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             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 cfc6716c0c..4870bdebb6 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
index 89c253e6bc..491fdeda3a 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bottomSheetTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
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 dc4bb457cd..8660eb4bb5 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,7 +36,7 @@
 
             <TextView
                 android:id="@+id/inviterText"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -49,7 +49,7 @@
 
             <TextView
                 android:id="@+id/inviterMxid"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.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 589e237789..5e4874410a 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_signout_warning_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/backupStatusText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
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 f99dff6e51..5a65e41ba5 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/widgetPermissionHeader2"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -57,7 +57,7 @@
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerDisplayName"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
@@ -67,7 +67,7 @@
 
             <TextView
                 android:id="@+id/widgetPermissionOwnerId"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
@@ -80,7 +80,7 @@
 
     <TextView
         android:id="@+id/widgetPermissionSharedInfo"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -99,7 +99,7 @@
 
         <Button
             android:id="@+id/widgetPermissionDecline"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
@@ -108,7 +108,7 @@
 
         <Button
             android:id="@+id/widgetPermissionContinue"
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_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 fdc3a49ae9..2189074749 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/keys_backup_setup_step3_copy_button_title"
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/keys_backup_recovery_key_text"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -52,7 +52,7 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -85,7 +85,7 @@
             tools:ignore="MissingPrefix" />
 
         <TextView
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index e0b6dfc531..a1109734f9 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/headerText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/descriptionText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
@@ -63,7 +63,7 @@
 
     <!--    <Button-->
     <!--        android:id="@+id/skipButton"-->
-    <!--        style="@style/VectorButtonStyleOutlined"-->
+    <!--        style="@style/Button.Vector.Style.Outlined"-->
     <!--        android:layout_width="match_parent"-->
     <!--        android:layout_height="wrap_content"-->
     <!--        android:layout_marginTop="@dimen/layout_vertical_margin"-->
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 0b1cf98d49..b4138a1963 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/headerText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 5559c8dc8b..6829e7924f 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/spaceNameView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -56,7 +56,7 @@
 
         <TextView
             android:id="@+id/spaceDescription"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 13316b2587..65b00219d3 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index 3816c206b4..4a78b34ec2 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -104,7 +104,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/ComposerEditTextStyle"
+        style="@style/EditText.Vector.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index 079bc9705a..a17c9689f0 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -135,7 +135,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/ComposerEditTextStyle"
+        style="@style/EditText.Vector.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/room_message_placeholder_not_encrypted"
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 e40351b21d..7a0790788d 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,7 +42,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
@@ -68,7 +68,7 @@
 
     <TextView
         android:id="@+id/composerRelatedMessageContent"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -147,7 +147,7 @@
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
-        style="@style/ComposerEditTextStyle"
+        style="@style/EditText.Vector.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index 5339e7dc61..a3cd0ca372 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/cart_badge"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="14dp"
         android:layout_height="14dp"
         android:background="@drawable/bg_unread_highlight"
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 a644de6df1..b9ddd7db4d 100644
--- a/vector/src/main/res/layout/dialog_background_sync_mode.xml
+++ b/vector/src/main/res/layout/dialog_background_sync_mode.xml
@@ -17,7 +17,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_battery"
@@ -25,7 +25,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -43,7 +43,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_real_time"
@@ -51,7 +51,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -69,7 +69,7 @@
             android:padding="16dp">
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/settings_background_fdroid_sync_mode_disabled"
@@ -77,7 +77,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.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 37fb66d269..743243358c 100644
--- a/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
+++ b/vector/src/main/res/layout/dialog_confirmation_with_reason.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/dialogConfirmationText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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 5472149f63..77e509ba54 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -13,14 +13,14 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -29,13 +29,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_name"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device name" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -44,13 +44,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_id"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device id" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -59,13 +59,13 @@
 
         <TextView
             android:id="@+id/encrypted_device_info_device_key"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="a device key" />
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index bdee2e9b44..398694e9a5 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/disclaimerTextView"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/disclaimer_title"
@@ -52,7 +52,7 @@
         app:layout_constraintTop_toBottomOf="@id/disclaimerIconsLayout" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
index de4837d7ed..f41eaaf072 100644
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ b/vector/src/main/res/layout/dialog_event_content.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/event_content_text_view"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index a9388b1860..6b5b12f2a1 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/exportDialogText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/encryption_export_notice"
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index aeb6398097..14f0c44bc0 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/dialog_e2e_keys_passphrase_filename"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
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 7559382f34..d1c205c920 100644
--- a/vector/src/main/res/layout/dialog_no_sticker_pack.xml
+++ b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
@@ -1,7 +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"
+    style="@style/TextView.Vector.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 49fd1d15fd..d10ec2eff4 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -14,7 +14,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
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 1243ab27bf..f79f5e86a0 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/VectorTextView.HeadlineM"
+                style="@style/TextView.Vector.HeadlineM"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/keepItSafeText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
index 80acd89474..62891c6ad7 100644
--- a/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
+++ b/vector/src/main/res/layout/dialog_ssl_fingerprint.xml
@@ -13,7 +13,7 @@
         android:paddingEnd="?dialogPreferredPadding">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/ssl_explanation"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -29,7 +29,7 @@
 
         <TextView
             android:id="@+id/ssl_user_id"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint_title"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
@@ -45,14 +45,14 @@
 
         <TextView
             android:id="@+id/ssl_fingerprint"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="6dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
index 9c4e2b3bdf..e1af418712 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/bootstrapConclusionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index 2cc70d8edb..389ab1ff09 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -58,7 +58,7 @@
 
     <Button
         android:id="@+id/bootstrapPasswordButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
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 d80c612b47..e7676feb05 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/bootstrapWarningInfo"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -76,7 +76,7 @@
 
     <Button
         android:id="@+id/bootstrapSubmit"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/_continue"
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 d9ec278c7a..bc79350162 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -41,7 +41,7 @@
 
         <Button
             android:id="@+id/bootstrapMigrateUseFile"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/use_file"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/bootstrapMigrateForgotPassphrase"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/bootstrapMigrateContinueButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index d8e04fba57..43e3c7bfe3 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/reAuthFailureText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -40,7 +40,7 @@
 
     <Button
         android:id="@+id/bootstrapCancelButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -49,7 +49,7 @@
 
     <Button
         android:id="@+id/bootstrapRetryButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index f0661eec8d..a173abe69f 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapSaveText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/bootstrapRecoveryKeyText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 69a79ab59c..ab697048b3 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapSetupSecureText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/bootstrapSetupWarningTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index fe4a99c6c6..b78c3901cf 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/bootstrapDescriptionText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/bootstrapLoadingStatusText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index 9033a1fab3..b2d49d26fe 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -92,7 +92,7 @@
 
             <Button
                 android:id="@+id/phoneBookSearchForMatrixContacts"
-                style="@style/VectorButtonStyleText"
+                style="@style/Button.Vector.Style.Text"
                 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_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 77729fe4e0..bdd02c3340 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         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 a461fd55dc..41678d7811 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index bd343d8983..36d7036fd2 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/deactivateAccountContent"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/deactivate_account_content"
@@ -33,7 +33,7 @@
 
         <Button
             android:id="@+id/deactivateAccountSubmit"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index ad95f98fab..529b213f16 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -46,7 +46,7 @@
 
                     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
                         android:id="@+id/drawerUnreadCounterBadgeView"
-                        style="@style/VectorTextView.Micro"
+                        style="@style/TextView.Vector.Micro"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
@@ -77,7 +77,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarTitleView"
-                        style="@style/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
@@ -89,7 +89,7 @@
 
                     <TextView
                         android:id="@+id/groupToolbarSpaceTitleView"
-                        style="@style/VectorTextView.Subtitle"
+                        style="@style/TextView.Vector.Subtitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 4a1421c61e..12c2fc4ef8 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/homeDrawerUsernameView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
         <TextView
             android:id="@+id/homeDrawerUserIdView"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -78,7 +78,7 @@
 
         <Button
             android:id="@+id/homeDrawerInviteFriendButton"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
             android:layout_marginTop="8dp"
@@ -130,7 +130,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSettingsView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
@@ -149,7 +149,7 @@
 
     <TextView
         android:id="@+id/homeDrawerHeaderSignoutView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
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 f108344c5c..60533b365c 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
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/keys_restore_with_key"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -77,7 +77,7 @@
 
         <TextView
             android:id="@+id/keys_restore_key_help_with_link"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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 3c7dd9f38e..bdf92a402d 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
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/keys_backup_restore_with_passphrase"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -74,7 +74,7 @@
 
         <TextView
             android:id="@+id/helperTextWithLink"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index c8a57d477c..cb0cce68c8 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/success_details_text"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         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 36b0158156..932c7f73da 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -39,7 +39,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
@@ -66,7 +66,7 @@
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_advanced_option_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -83,7 +83,7 @@
 
     <Button
         android:id="@+id/keys_backup_setup_step1_manual_export_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_margin="16dp"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@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 007eb596f2..7319471f1e 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_text_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -120,7 +120,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step2_recovery_key_alternative"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -133,7 +133,7 @@
 
         <Button
             android:id="@+id/keys_backup_setup_step2_skip_button"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
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 e2d932e851..8ab6561a7d 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -43,7 +43,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_line1_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -55,7 +55,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_label2"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -68,7 +68,7 @@
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_recovery_key_text"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_horizontal_margin"
@@ -82,7 +82,7 @@
 
         <Button
             android:id="@+id/keys_backup_setup_step3_copy_button"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 4b801f7a4d..7177bd2543 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -35,7 +35,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -101,7 +101,7 @@
 
             <TextView
                 android:id="@+id/loginPasswordNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -117,7 +117,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -125,7 +125,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -147,7 +147,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
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 cb6f2fb95b..50a78b8881 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -25,7 +25,7 @@
 
             <TextView
                 android:id="@+id/loginAccountCreatedSubtitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -33,7 +33,7 @@
                 tools:text="@string/login_account_created_subtitle" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -41,7 +41,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -67,7 +67,7 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedMemberName"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -84,7 +84,7 @@
 
                 <TextView
                     android:id="@+id/loginAccountCreatedTime"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -96,7 +96,7 @@
                     tools:text="@tools:sample/date/hhmm" />
 
                 <TextView
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/login_account_created_message"
@@ -108,7 +108,7 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -122,7 +122,7 @@
 
                 <Button
                     android:id="@+id/loginAccountCreatedLater"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -130,7 +130,7 @@
 
                 <Button
                     android:id="@+id/loginAccountCreatedDone"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_captcha.xml b/vector/src/main/res/layout/fragment_login_captcha.xml
index fed793cc8c..49504f1ada 100644
--- a/vector/src/main/res/layout/fragment_login_captcha.xml
+++ b/vector/src/main/res/layout/fragment_login_captcha.xml
@@ -22,7 +22,7 @@
 
         <TextView
             android:id="@+id/loginCaptchaNotice"
-            style="@style/VectorTextAppearanceCaption"
+            style="@style/TextAppearance.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
index d2ffd1932e..1dfda244f1 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="?vctr_content_primary"
@@ -25,7 +25,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -70,7 +70,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -80,7 +80,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
index 6011c41845..c5d49a520c 100644
--- a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -37,7 +37,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormMandatoryNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="26dp"
@@ -49,7 +49,7 @@
 
             <TextView
                 android:id="@+id/loginGenericTextInputFormNotice2"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="start"
@@ -82,7 +82,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormOtherButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -92,7 +92,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormLater"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -103,7 +103,7 @@
 
                 <Button
                     android:id="@+id/loginGenericTextInputFormSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index bcace7017e..c71909476f 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="?vctr_content_primary"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -89,7 +89,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
index d6ef48caf3..bb4d39dab8 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
                 tools:text="@string/login_reset_password_on" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -51,7 +51,7 @@
 
             <TextView
                 android:id="@+id/loginNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -60,7 +60,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -109,7 +109,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
index aa4e9d3ab7..93be6d489c 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_mail_confirmation_title"
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -30,7 +30,7 @@
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -39,7 +39,7 @@
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
index fb1c992db0..0d33880a18 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -23,7 +23,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordMailConfirmationNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -31,7 +31,7 @@
                 tools:text="@string/login_reset_password_mail_confirmation_notice" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -40,7 +40,7 @@
 
             <Button
                 android:id="@+id/resetPasswordMailConfirmationSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success.xml b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
index 3d78f3fb81..2fc0d08d21 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_reset_password_success_title"
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -30,7 +30,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -39,7 +39,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
index 41941654f2..f07db563d6 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
@@ -14,7 +14,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -23,7 +23,7 @@
 
             <TextView
                 android:id="@+id/resetPasswordSuccessNotice"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -31,7 +31,7 @@
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -40,7 +40,7 @@
 
             <Button
                 android:id="@+id/resetPasswordSuccessSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 8407df7e1c..ce4a968e4e 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -19,7 +19,7 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
@@ -32,7 +32,7 @@
 
             <TextView
                 android:id="@+id/loginServerText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -73,7 +73,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -116,7 +116,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
@@ -130,7 +130,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsLearnMore"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
@@ -158,7 +158,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
@@ -171,7 +171,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
@@ -187,7 +187,7 @@
 
             <Button
                 android:id="@+id/loginServerIKnowMyIdSubmit"
-                style="@style/Style.Vector.Login.Button.Text"
+                style="@style/Button.Vector.Style.Login.Text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
index c84ad5ea2f..5842e2fe2f 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/loginServerTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginServerText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -61,7 +61,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -77,7 +77,7 @@
 
             <TextView
                 android:id="@+id/loginServerText2"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
@@ -98,7 +98,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
@@ -111,7 +111,7 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
-                    style="@style/VectorTextView.Caption"
+                    style="@style/TextView.Vector.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
@@ -127,7 +127,7 @@
 
             <TextView
                 android:id="@+id/loginServerChoiceEmsLearnMore"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="32dp"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index d798741e66..cac3fe9ee0 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -27,7 +27,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -36,7 +36,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -46,7 +46,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormLearnMore"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -75,7 +75,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -86,7 +86,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormNotice"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
@@ -96,7 +96,7 @@
 
             <Button
                 android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
index e99ec4223a..0b4f50faf0 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -46,7 +46,7 @@
 
             <TextView
                 android:id="@+id/loginServerUrlFormClearHistory"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -60,7 +60,7 @@
 
             <Button
                 android:id="@+id/loginServerUrlFormSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
index 73846d47cf..15d50c8d4c 100644
--- a/vector/src/main/res/layout/fragment_login_signin_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/loginWelcomeBack"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -43,7 +43,7 @@
 
             <TextView
                 android:id="@+id/loginWelcomeBackWarning"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -98,7 +98,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -108,7 +108,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
index c0fc136b17..c96c149e4a 100644
--- a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -87,7 +87,7 @@
 
                 <Button
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Text"
+                    style="@style/Button.Vector.Style.Login.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -97,7 +97,7 @@
 
                 <Button
                     android:id="@+id/loginSubmit"
-                    style="@style/Style.Vector.Login.Button"
+                    style="@style/Button.Vector.Style.Login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
@@ -119,7 +119,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
index 83adbbf34b..ac6408b439 100644
--- a/vector/src/main/res/layout/fragment_login_signin_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginSubtitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -52,7 +52,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -61,7 +61,7 @@
 
             <TextView
                 android:id="@+id/loginServerText3"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -71,7 +71,7 @@
 
             <Button
                 android:id="@+id/loginChooseAServer"
-                style="@style/Style.Vector.Login.Button.Text"
+                style="@style/Button.Vector.Style.Login.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
index 8f863a088f..407c1e6682 100644
--- a/vector/src/main/res/layout/fragment_login_signup_password_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
@@ -16,7 +16,7 @@
                 tools:ignore="ContentDescription" />
 
             <TextView
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
                 android:textColor="?vctr_content_primary" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -33,7 +33,7 @@
 
             <TextView
                 android:id="@+id/loginMatrixIdentifier"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -41,7 +41,7 @@
                 tools:text="\@user:domain.org" />
 
             <TextView
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -50,7 +50,7 @@
                 android:textStyle="italic" />
 
             <TextView
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -99,7 +99,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index 0ff3016514..0521242468 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -33,7 +33,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -45,7 +45,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="27dp"
@@ -59,7 +59,7 @@
             <!-- Sign up or sign in SSO -->
             <Button
                 android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="38dp"
@@ -71,7 +71,7 @@
             <!-- Sign in or gone -->
             <Button
                 android:id="@+id/loginSignupSigninSignIn"
-                style="@style/Style.Vector.Login.Button.Outlined"
+                style="@style/Button.Vector.Style.Login.Outlined"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="14dp"
@@ -99,7 +99,7 @@
 
                 <TextView
                     android:id="@+id/loginSignupSigninSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="27dp"
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
index 2996647522..770693c075 100644
--- a/vector/src/main/res/layout/fragment_login_signup_username_2.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -17,7 +17,7 @@
 
             <TextView
                 android:id="@+id/loginTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -26,7 +26,7 @@
 
             <TextView
                 android:id="@+id/loginSubtitle"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -52,7 +52,7 @@
 
             <TextView
                 android:id="@+id/loginChooseHelp"
-                style="@style/VectorTextView.Caption"
+                style="@style/TextView.Vector.Caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/login_please_choose_a_user_name_help_2"
@@ -61,7 +61,7 @@
 
             <Button
                 android:id="@+id/loginSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
@@ -82,7 +82,7 @@
 
                 <TextView
                     android:id="@+id/loginSocialLoginHeader"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 545bb5522f..de39fa3f4c 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -105,7 +105,7 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -130,7 +130,7 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -155,7 +155,7 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -179,7 +179,7 @@
 
     <Button
         android:id="@+id/loginSplashSubmit"
-        style="@style/Style.Vector.Login.Button"
+        style="@style/Button.Vector.Style.Login"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/login_splash_submit"
@@ -199,7 +199,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.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 190044fcdf..75d4663336 100644
--- a/vector/src/main/res/layout/fragment_login_splash_2.xml
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/loginSplashTitle"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -105,7 +105,7 @@
 
         <TextView
             android:id="@+id/loginSplashText1"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -130,7 +130,7 @@
 
         <TextView
             android:id="@+id/loginSplashText2"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -155,7 +155,7 @@
 
         <TextView
             android:id="@+id/loginSplashText3"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -189,7 +189,7 @@
 
         <Button
             android:id="@+id/loginSignupSigninSignUp"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -197,7 +197,7 @@
 
         <Button
             android:id="@+id/loginSignupSigninSignIn"
-            style="@style/Style.Vector.Login.Button.Text"
+            style="@style/Button.Vector.Style.Login.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -216,7 +216,7 @@
 
     <TextView
         android:id="@+id/loginSplashVersion"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.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_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
index 694c17afd6..18a6ad618e 100644
--- a/vector/src/main/res/layout/fragment_login_sso_only_2.xml
+++ b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
@@ -15,7 +15,7 @@
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -25,7 +25,7 @@
 
             <Button
                 android:id="@+id/loginSignupSigninSubmit"
-                style="@style/Style.Vector.Login.Button"
+                style="@style/Button.Vector.Style.Login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index b295719e09..a00e48d413 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -20,7 +20,7 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/VectorTextAppearanceTitle"
+            style="@style/TextAppearance.Vector.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
@@ -32,7 +32,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/VectorTextAppearanceBody"
+            style="@style/TextAppearance.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -54,7 +54,7 @@
 
         <Button
             android:id="@+id/loginTermsSubmit"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_marginEnd="36dp"
             android:text="@string/accept"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index 051a4f18bf..b6c8f4764a 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/loginTermsTitle"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="36dp"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/loginTermsNotice"
-            style="@style/VectorTextAppearanceBody"
+            style="@style/TextAppearance.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -58,7 +58,7 @@
 
         <Button
             android:id="@+id/loginTermsSubmit"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_marginEnd="36dp"
             android:text="@string/accept"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email.xml b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
index a68182bdcb..8fa747ff51 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email.xml
@@ -16,7 +16,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/login_wait_for_email_title"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index 874423fb01..f227a1f312 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -15,7 +15,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailTitle"
-                style="@style/VectorTextView.Title"
+                style="@style/TextView.Vector.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -24,7 +24,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailNotice"
-                style="@style/VectorTextView.Subtitle"
+                style="@style/TextView.Vector.Subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -34,7 +34,7 @@
 
             <TextView
                 android:id="@+id/loginWaitForEmailHelp"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
@@ -43,7 +43,7 @@
                 android:textColor="?vctr_content_secondary" />
 
             <ProgressBar
-                style="@style/VectorHorizontalProgressBar"
+                style="@style/ProgressBar.Vector.Horizontal"
                 android:layout_width="240dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 80c9ea1620..8345c58acb 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
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 fa6c4c208c..43a25b05a1 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
@@ -42,7 +42,7 @@
 
         <TextView
             android:id="@+id/matrixToCardNameText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -56,7 +56,7 @@
 
         <TextView
             android:id="@+id/matrixToCardAliasText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -87,7 +87,7 @@
 
         <TextView
             android:id="@+id/matrixToAccessText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -133,7 +133,7 @@
 
             <TextView
                 android:id="@+id/spaceChildMemberCountText"
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -144,7 +144,7 @@
 
         <TextView
             android:id="@+id/matrixToCardDescText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -214,7 +214,7 @@
         <!-- layout_goneMarginStart: add half the width of the avatar: 15dp -->
         <TextView
             android:id="@+id/peopleYouMayKnowText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
@@ -254,7 +254,7 @@
 
         <!--        <Button-->
         <!--            android:id="@+id/matrixToCardSecondaryButton"-->
-        <!--            style="@style/VectorButtonStyleOutlined"-->
+        <!--            style="@style/Button.Vector.Style.Outlined"-->
         <!--            android:layout_width="0dp"-->
         <!--            android:layout_height="wrap_content"-->
         <!--            android:layout_marginTop="8dp"-->
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 4c98f26ec3..b99cfb1172 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/matrixToCardNameText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/matrixToCardUserIdText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 94a5b84d78..b81a962b93 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -36,7 +36,7 @@
 
         <Button
             android:id="@+id/publicRoomsCreateNewRoom"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_reauth_confirm.xml b/vector/src/main/res/layout/fragment_reauth_confirm.xml
index 0eb6ef1775..1aeb61e9bf 100644
--- a/vector/src/main/res/layout/fragment_reauth_confirm.xml
+++ b/vector/src/main/res/layout/fragment_reauth_confirm.xml
@@ -11,7 +11,7 @@
 
         <TextView
             android:id="@+id/reAuthConfirmText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -70,7 +70,7 @@
         <!--            android:layout_height="wrap_content"-->
         <!--            android:gravity="start"-->
         <!--            android:text="@string/login_signin_matrix_id_password_notice"-->
-        <!--            style="@style/VectorTextView.Caption"-->
+        <!--            style="@style/TextView.Vector.Caption"-->
         <!--            android:visibility="gone"-->
         <!--            app:layout_constraintEnd_toEndOf="parent"-->
         <!--            app:layout_constraintStart_toStartOf="parent"-->
@@ -79,7 +79,7 @@
 
         <TextView
             android:id="@+id/genericErrorText"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="start"
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 18af0a56ab..cabde658b6 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/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -50,7 +50,7 @@
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/fragment_review_terms.xml b/vector/src/main/res/layout/fragment_review_terms.xml
index 2c7fa6c586..57d177d7b8 100644
--- a/vector/src/main/res/layout/fragment_review_terms.xml
+++ b/vector/src/main/res/layout/fragment_review_terms.xml
@@ -30,7 +30,7 @@
 
         <Button
             android:id="@+id/reviewTermsDecline"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             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 4af84c63ee..5d8b6c6cbb 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/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -63,7 +63,7 @@
 
                 <TextView
                     android:id="@+id/roomToolbarSubtitleView"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     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 d9a241f72e..9cba9a955f 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -60,7 +60,7 @@
 
             <ProgressBar
                 android:id="@+id/roomPreviewPeekingProgress"
-                style="@style/VectorHorizontalProgressBar"
+                style="@style/ProgressBar.Vector.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
@@ -90,7 +90,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewName"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="56dp"
@@ -101,7 +101,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewTopic"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -112,7 +112,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewLabel"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
@@ -122,7 +122,7 @@
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewError"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_vertical_margin"
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 1ebf15edb4..7f3deaecd0 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/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     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 d32622b1de..f4939d0341 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/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     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 196ebfaff4..94fb3bb992 100644
--- a/vector/src/main/res/layout/fragment_room_widget.xml
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -40,7 +40,7 @@
 
         <TextView
             android:id="@+id/widgetErrorText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_set_identity_server.xml b/vector/src/main/res/layout/fragment_set_identity_server.xml
index 596340431a..446b617771 100644
--- a/vector/src/main/res/layout/fragment_set_identity_server.xml
+++ b/vector/src/main/res/layout/fragment_set_identity_server.xml
@@ -14,7 +14,7 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultNotice"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -24,7 +24,7 @@
 
         <Button
             android:id="@+id/identityServerSetDefaultSubmit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/identityServerSetDefaultAlternative"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -64,7 +64,7 @@
 
         <Button
             android:id="@+id/identityServerSetDefaultAlternativeSubmit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
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 cf09b14361..bf8324a821 100644
--- a/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
+++ b/vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/troubleshoot_summ_title"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -42,7 +42,7 @@
 
         <TextView
             android:id="@+id/toubleshoot_summ_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
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 b85adce5aa..61af81f572 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/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -76,7 +76,7 @@
 
         <Button
             android:id="@+id/createNewRoom"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
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 d4f63aec93..5bbb4d9bd0 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -24,7 +24,7 @@
 
         <TextView
             android:id="@+id/accessInfoHelpText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 40a915d9e9..fc47dafae9 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -21,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -35,7 +35,7 @@
 
         <TextView
             android:id="@+id/joinInfoHelpText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
@@ -72,7 +72,7 @@
 
         <TextView
             android:id="@+id/changeLaterText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index de3e5537ff..d378558a1e 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -62,7 +62,7 @@
 
             <ProgressBar
                 android:id="@+id/spacePreviewPeekingProgress"
-                style="@style/VectorHorizontalProgressBar"
+                style="@style/ProgressBar.Vector.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
@@ -101,7 +101,7 @@
 
             <Button
                 android:id="@+id/spacePreviewDeclineInviteButton"
-                style="@style/VectorButtonStyle.Destructive"
+                style="@style/Button.Vector.Style.Destructive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -110,7 +110,7 @@
 
             <Button
                 android:id="@+id/spacePreviewAcceptInviteButton"
-                style="@style/VectorButtonStyle.Positive"
+                style="@style/Button.Vector.Style.Positive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
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 eed347f82f..13efd49c40 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_key_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -81,7 +81,7 @@
 
         <Button
             android:id="@+id/ssss_key_use_file"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/use_file"
@@ -90,7 +90,7 @@
 
         <Button
             android:id="@+id/ssss_key_submit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/_continue"
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 c05c709b76..7ea7b64c9a 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase_warning_text"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
@@ -88,7 +88,7 @@
 
         <Button
             android:id="@+id/ssss_passphrase_submit"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
@@ -98,7 +98,7 @@
 
         <TextView
             android:id="@+id/ssss_passphrase_or"
-            style="@style/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -110,7 +110,7 @@
 
         <Button
             android:id="@+id/ssss_passphrase_use_key"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="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 b4ca7f05a9..5004bb17d3 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_all_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -45,7 +45,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_other_devices"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:layout_marginStart="16dp"
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_text3"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/ssss_reset_text4"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -89,7 +89,7 @@
 
         <Button
             android:id="@+id/ssss_reset_button_cancel"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cancel"
@@ -97,7 +97,7 @@
 
         <Button
             android:id="@+id/ssss_reset_button_reset"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/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 0d8cb778eb..b09f3a3d2f 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -104,7 +104,7 @@
 
                 <TextView
                     android:id="@+id/showUserCodeCardNameText"
-                    style="@style/VectorTextView.Subtitle"
+                    style="@style/TextView.Vector.Subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -118,7 +118,7 @@
 
                 <TextView
                     android:id="@+id/showUserCodeCardUserIdText"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -158,7 +158,7 @@
 
         <TextView
             android:id="@+id/showUserCodeInfoText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -189,7 +189,7 @@
 
         <Button
             android:id="@+id/showUserCodeScanButton"
-            style="@style/VectorButtonStyleText"
+            style="@style/Button.Vector.Style.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index 8ffd18c2fc..58630f9149 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/VectorTextView.HeadlineM"
+                        style="@style/TextView.Vector.HeadlineM"
                         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 a9abc3eff6..3cc2dd2c35 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/VectorTextView.HeadlineM"
+                    style="@style/TextView.Vector.HeadlineM"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -111,7 +111,7 @@
 
     <TextView
         android:id="@+id/userListE2EbyDefaultDisabled"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index 892d86d670..81e8f6de85 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/section_header_textview"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index 6ca2f93561..d8500256ba 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/commandName"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/commandParameter"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/commandDescription"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/commandName"
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index 62c435e6e5..fb49eeb955 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/itemAutocompleteEmoji"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiName"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/itemAutocompleteEmojiSubname"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
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 1896ea8b7b..68fb680b22 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/matrixItemAutocompleteName"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/matrixItemAutocompleteSubname"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
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 6f209c9c32..4b631065c5 100644
--- a/vector/src/main/res/layout/item_autocomplete_more_result.xml
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/VectorTextView.Caption"
+    style="@style/TextView.Vector.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 8f341f49a6..e396cefd91 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -53,7 +53,7 @@
 
         <TextView
             android:id="@+id/actionTitle"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
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 c83c36ed42..23a76e75ee 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
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_timestamp"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
@@ -67,7 +67,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -86,7 +86,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body_details"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
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 4650eeee47..c692bda984 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,7 +21,7 @@
 
     <TextView
         android:id="@+id/messageStatusText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index 339813f736..89db894631 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/quickReaction0"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/quickReaction1"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/quickReaction2"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/quickReaction3"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/quickReaction4"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/quickReaction5"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -63,7 +63,7 @@
 
     <TextView
         android:id="@+id/quickReaction6"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
@@ -72,7 +72,7 @@
 
     <TextView
         android:id="@+id/quickReaction7"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
index 69e8b1f076..bba469b056 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_radio.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/actionTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/actionDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index 36124c66e6..abeae9b8d1 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -27,7 +27,7 @@
 
     <TextView
         android:id="@+id/bottomSheetRoomPreviewName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
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 c3cdccd6b5..eed9407557 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_primary"
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemBottomSheetTitleSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index 0fe9d4b61a..858e0131b2 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -38,7 +38,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/breadcrumbsUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -56,7 +56,7 @@
 
     <TextView
         android:id="@+id/breadcrumbsTypingView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:background="@drawable/circle"
diff --git a/vector/src/main/res/layout/item_completion_homeserver.xml b/vector/src/main/res/layout/item_completion_homeserver.xml
index 5e4ec08217..f66608bf0f 100644
--- a/vector/src/main/res/layout/item_completion_homeserver.xml
+++ b/vector/src/main/res/layout/item_completion_homeserver.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index fadb00bfb2..f1266e9892 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/actionTitleText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 7b8ffd2312..954c20afc3 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/contactDetailName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/contactDetailMatrixId"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 0663b2ed7d..c6563e71d2 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/contactDisplayName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 20a2690b5c..6cfdbcd493 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -59,7 +59,7 @@
 
     <TextView
         android:id="@+id/createDirectRoomUserID"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 39c1f04aa7..5bbb21241e 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -18,7 +18,7 @@
         <!-- In compact mode only this is shown-->
         <TextView
             android:id="@+id/itemDeviceSimpleSummary"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
@@ -31,7 +31,7 @@
         -->
         <TextView
             android:id="@+id/itemDeviceDisplayNameLabel"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -40,7 +40,7 @@
 
         <TextView
             android:id="@+id/itemDeviceDisplayName"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -48,7 +48,7 @@
 
         <TextView
             android:id="@+id/itemDeviceIdLabel"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -57,7 +57,7 @@
 
         <TextView
             android:id="@+id/itemDeviceId"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
@@ -67,7 +67,7 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeenLabel"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/itemDeviceLastSeen"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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 82b43776a2..2425980fec 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -13,7 +13,7 @@
 
     <TextView
         android:id="@+id/item_emoji_tv"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -29,7 +29,7 @@
 
         <TextView
             android:id="@+id/item_emoji_name"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="?vctr_content_primary"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/item_emoji_keyword"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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 ef46639041..b0c213b1a1 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -10,7 +10,7 @@
     <!-- size in dp, because we do not want the display to be impacted by font size setting -->
     <TextView
         android:id="@+id/item_emoji_tv"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/item_emoji_name_tv"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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 ec03a13530..d104712163 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemErrorRetryText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="?colorError"
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 1f474baeb7..18f3260fdd 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -9,7 +9,7 @@
 
     <im.vector.app.core.ui.views.NonScrollingTextView
         android:id="@+id/expandableContent"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:autoLink="web"
diff --git a/vector/src/main/res/layout/item_form_advanced_toggle.xml b/vector/src/main/res/layout/item_form_advanced_toggle.xml
index da6b21a60d..47f1917e9f 100644
--- a/vector/src/main/res/layout/item_form_advanced_toggle.xml
+++ b/vector/src/main/res/layout/item_form_advanced_toggle.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/itemFormAdvancedToggleTitleView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 30d2b15c22..1823d21c46 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/formSwitchTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/formSwitchSummary"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_generic_button.xml b/vector/src/main/res/layout/item_generic_button.xml
index 75d1e7a624..d4139bfa0c 100644
--- a/vector/src/main/res/layout/item_generic_button.xml
+++ b/vector/src/main/res/layout/item_generic_button.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/itemGenericItemButton"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAllCaps="false"
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index 6e2c0fa8f2..a23f1953d6 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/emptyItemTitleView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/emptyItemMessageView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_generic_footer.xml b/vector/src/main/res/layout/item_generic_footer.xml
index 3f4d09a26c..209c18b7bf 100644
--- a/vector/src/main/res/layout/item_generic_footer.xml
+++ b/vector/src/main/res/layout/item_generic_footer.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/itemGenericFooterText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 2e5e7fc5d5..4f5655fd85 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_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/itemGenericHeaderText"
-    style="@style/VectorTextView.Subtitle"
+    style="@style/TextView.Vector.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index b436b2d64c..edef6b0696 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/item_generic_title_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/item_generic_description_text"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -115,7 +115,7 @@
 
     <Button
         android:id="@+id/item_generic_destructive_action_button"
-        style="@style/VectorButtonStyle.Destructive"
+        style="@style/Button.Vector.Style.Destructive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
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 06d09eed23..1f7f54b572 100644
--- a/vector/src/main/res/layout/item_generic_pill_footer.xml
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -20,7 +20,7 @@
 
     <TextView
         android:id="@+id/itemGenericPillText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index da0e12cbfb..7304fee85f 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/itemGenericWithValueLabelText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/itemGenericWithValueValueText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 2586fd4e6e..605a352de4 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index a3c9666609..fd7474d93f 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
diff --git a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
index 3b7c528cbf..cece6e34ca 100644
--- a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
+++ b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
@@ -18,7 +18,7 @@
 
     <Button
         android:id="@+id/keys_backup_settings_footer_button2"
-        style="@style/VectorButtonStyle"
+        style="@style/Button.Vector.Style"
         android:layout_width="@dimen/button_max_width"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 9fdc5d6c1b..99c9bf25f1 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/knownUserName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -58,7 +58,7 @@
 
     <TextView
         android:id="@+id/knownUserID"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="end"
diff --git a/vector/src/main/res/layout/item_loading.xml b/vector/src/main/res/layout/item_loading.xml
index 03c0d81491..c23965f831 100644
--- a/vector/src/main/res/layout/item_loading.xml
+++ b/vector/src/main/res/layout/item_loading.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/loadingText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index dabca844fc..a8bfceca3b 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/localeTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/layout_horizontal_margin"
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/localeSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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_centered_button.xml b/vector/src/main/res/layout/item_login_centered_button.xml
index 07f4c379d4..d13242070d 100644
--- a/vector/src/main/res/layout/item_login_centered_button.xml
+++ b/vector/src/main/res/layout/item_login_centered_button.xml
@@ -6,7 +6,7 @@
 
     <Button
         android:id="@+id/itemLoginCenteredButton"
-        style="@style/Style.Vector.Login.Button"
+        style="@style/Button.Vector.Style.Login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
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 88ad676e3c..4465b5320d 100644
--- a/vector/src/main/res/layout/item_login_error_retry.xml
+++ b/vector/src/main/res/layout/item_login_error_retry.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/itemLoginErrorRetryText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index b07687f3a4..b94c40abd4 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -53,7 +53,7 @@
 
         <Button
             android:id="@+id/itemLoginPasswordFormForgetPasswordButton"
-            style="@style/Style.Vector.Login.Button.Text"
+            style="@style/Button.Vector.Style.Login.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
@@ -63,7 +63,7 @@
 
         <Button
             android:id="@+id/itemLoginPasswordFormSubmit"
-            style="@style/Style.Vector.Login.Button"
+            style="@style/Button.Vector.Style.Login"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/item_login_red_button.xml b/vector/src/main/res/layout/item_login_red_button.xml
index 4a290fa328..b7468d1d22 100644
--- a/vector/src/main/res/layout/item_login_red_button.xml
+++ b/vector/src/main/res/layout/item_login_red_button.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/itemLoginRedButton"
-        style="@style/Style.Vector.Login.Button"
+        style="@style/Button.Vector.Style.Login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_login_text.xml b/vector/src/main/res/layout/item_login_text.xml
index 8d0fd994f6..5b30612923 100644
--- a/vector/src/main/res/layout/item_login_text.xml
+++ b/vector/src/main/res/layout/item_login_text.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/itemLoginText"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index a77199b7af..5af6bb4896 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_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/itemLoginTitleText"
-    style="@style/VectorTextView.Title"
+    style="@style/TextView.Vector.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index 23b6d92461..3009e5720c 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.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/itemLoginTitleSmallText"
-    style="@style/VectorTextView.Subtitle"
+    style="@style/TextView.Vector.Subtitle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_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 5259719e55..aefdef7a5a 100644
--- a/vector/src/main/res/layout/item_no_result.xml
+++ b/vector/src/main/res/layout/item_no_result.xml
@@ -1,7 +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"
+    style="@style/TextView.Vector.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 a69eaff0f9..4d6336812f 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/troubleshootTestTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/troubleshootTestDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index 52baf61315..c2edadfbb9 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_title"
-        style="@style/VectorTextAppearanceBody"
+        style="@style/TextAppearance.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/adapter_item_policy_subtitle"
-        style="@style/VectorTextAppearanceCaption"
+        style="@style/TextAppearance.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_positive_button.xml b/vector/src/main/res/layout/item_positive_button.xml
index 11fb30599f..c15e4900ee 100644
--- a/vector/src/main/res/layout/item_positive_button.xml
+++ b/vector/src/main/res/layout/item_positive_button.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/itemGenericItemButton"
-        style="@style/VectorButtonStyle.Positive"
+        style="@style/Button.Vector.Style.Positive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 4977c08a60..ca87e69dad 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/actionTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -50,7 +50,7 @@
 
     <TextView
         android:id="@+id/actionSubtitle"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
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 59d0ac3dc4..7c68afe454 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -73,7 +73,7 @@
 
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
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 e44a399208..b187dbd50b 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
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml
index c7011eef26..ba6d40b79e 100644
--- a/vector/src/main/res/layout/item_profile_section.xml
+++ b/vector/src/main/res/layout/item_profile_section.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/itemProfileSectionView"
-    style="@style/VectorTextView.Title"
+    style="@style/TextView.Vector.Title"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="?vctr_list_separator_system"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 1364cf77cb..30f3f99316 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomTopic"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -62,7 +62,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomMembersCount"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
@@ -80,7 +80,7 @@
 
     <TextView
         android:id="@+id/itemPublicRoomAlias"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index a69107c86c..cc80dc8f0b 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppId"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppIdValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKey"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/pushGatewayKeyValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -56,7 +56,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -66,7 +66,7 @@
 
     <TextView
         android:id="@+id/pushGatewayAppNameValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -85,7 +85,7 @@
 
     <TextView
         android:id="@+id/pushGatewayDeviceNameValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -95,7 +95,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURL"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -104,7 +104,7 @@
 
     <TextView
         android:id="@+id/pushGatewayURLValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -113,7 +113,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormat"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -123,7 +123,7 @@
 
     <TextView
         android:id="@+id/pushGatewayFormatValue"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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 55ba8756e1..b019f1913b 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -16,7 +16,7 @@
 
         <TextView
             android:id="@+id/pushRuleId"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/pushRuleDescription"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index e590faaae1..f2d078684c 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -97,7 +97,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -135,7 +135,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -156,7 +156,7 @@
 
     <TextView
         android:id="@+id/roomLastEventTimeView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -168,7 +168,7 @@
 
     <TextView
         android:id="@+id/roomLastEventView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
@@ -183,7 +183,7 @@
 
     <TextView
         android:id="@+id/roomTypingView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
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 909d29d44d..d7f5ac2164 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         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_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index a87bdd3e9c..f4d2b47881 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/roomCategoryTitleView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -33,7 +33,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index e8633d7ea7..12a24dc816 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -27,7 +27,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -47,7 +47,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index 1969f6473a..c0b3c72586 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index 352b0e121a..86b355e0e8 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical">
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -16,7 +16,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterCreateRoom"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -25,7 +25,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterCreateDirect"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -33,7 +33,7 @@
 
     <Button
         android:id="@+id/roomFilterFooterOpenRoomDirectory"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 69910d2b75..f2a6d653c3 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -32,7 +32,7 @@
 
     <TextView
         android:id="@+id/roomInvitationNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 3482080a07..f2025fee4a 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
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 44b1f3e7b9..484b321a35 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
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
@@ -42,7 +42,7 @@
 
     <TextView
         android:id="@+id/itemManageRoomSuggested"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 2e941ca6cb..db31e5f2f6 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/messageTimeView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
@@ -50,7 +50,7 @@
 
     <TextView
         android:id="@+id/messageContentView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_settings_button.xml b/vector/src/main/res/layout/item_settings_button.xml
index dedf04438c..fc3ffe4588 100644
--- a/vector/src/main/res/layout/item_settings_button.xml
+++ b/vector/src/main/res/layout/item_settings_button.xml
@@ -8,7 +8,7 @@
 
     <Button
         android:id="@+id/settings_item_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index 8920577431..d1722cc375 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -13,7 +13,7 @@
 
     <TextView
         android:id="@+id/settings_item_text"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
@@ -29,7 +29,7 @@
 
     <Button
         android:id="@+id/settings_item_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_settings_continue_cancel.xml b/vector/src/main/res/layout/item_settings_continue_cancel.xml
index 8f7dadf4a2..6ad8f366b2 100644
--- a/vector/src/main/res/layout/item_settings_continue_cancel.xml
+++ b/vector/src/main/res/layout/item_settings_continue_cancel.xml
@@ -9,7 +9,7 @@
 
     <Button
         android:id="@+id/settings_item_cancel_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/cancel"
@@ -19,7 +19,7 @@
 
     <Button
         android:id="@+id/settings_item_continue_button"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/_continue"
diff --git a/vector/src/main/res/layout/item_settings_edit_text.xml b/vector/src/main/res/layout/item_settings_edit_text.xml
index 4407e136a2..d240b6e072 100644
--- a/vector/src/main/res/layout/item_settings_edit_text.xml
+++ b/vector/src/main/res/layout/item_settings_edit_text.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/settings_item_edit_text_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
diff --git a/vector/src/main/res/layout/item_settings_helper_info.xml b/vector/src/main/res/layout/item_settings_helper_info.xml
index 489f7a44bd..9a73dca344 100644
--- a/vector/src/main/res/layout/item_settings_helper_info.xml
+++ b/vector/src/main/res/layout/item_settings_helper_info.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_helper_text"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_settings_information.xml b/vector/src/main/res/layout/item_settings_information.xml
index 0d91ba3d12..3578990e98 100644
--- a/vector/src/main/res/layout/item_settings_information.xml
+++ b/vector/src/main/res/layout/item_settings_information.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/settings_item_information"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
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 15c6afe70d..369977f6ab 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/VectorTextView.HeadlineM"
+    style="@style/TextView.Vector.HeadlineM"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?vctr_header_background"
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index 175dfb63b9..64d2af5004 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -18,7 +18,7 @@
 
         <TextView
             android:id="@+id/settings_item_title"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
@@ -28,7 +28,7 @@
 
         <TextView
             android:id="@+id/settings_item_description"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 13feeabcb3..581a0bdcc6 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/item_settings_three_pid_title"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
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 92d45ee02e..8d241ec46c 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 33d869e678..4b04d9588d 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -35,7 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -57,7 +57,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -75,7 +75,7 @@
 
     <TextView
         android:id="@+id/groupDescView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index 788590287d..445b28e8d4 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 551d6377c3..546a5c2b9c 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -9,7 +9,7 @@
     android:paddingEnd="16dp">
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -19,7 +19,7 @@
         app:drawableEndCompat="@drawable/ic_beta_pill" />
 
     <TextView
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/spaceBetaFeedbackAction"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="8dp"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index bed015c4ca..5921b0c307 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/childRoomName"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -61,7 +61,7 @@
 
         <TextView
             android:id="@+id/childRoomTopic"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
@@ -87,7 +87,7 @@
 
         <TextView
             android:id="@+id/spaceChildMemberCountText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index df7ff6164c..e93c87dcc3 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -46,7 +46,7 @@
 
     <TextView
         android:id="@+id/childSpaceName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
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 33f344f7cf..94c11c5403 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/spaceSummaryMemberCountText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/spaceSummaryTopic"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 7a8211cb94..b15a6b6fd4 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -35,7 +35,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
@@ -57,7 +57,7 @@
 
     <TextView
         android:id="@+id/groupNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index abd0cc8705..9ecbc56239 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -38,7 +38,7 @@
 
     <TextView
         android:id="@+id/roomNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -59,7 +59,7 @@
 
     <TextView
         android:id="@+id/suggestedRoomDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
@@ -74,7 +74,7 @@
 
     <Button
         android:id="@+id/joinSuggestedRoomButton"
-        style="@style/VectorButtonStyleOutlined"
+        style="@style/Button.Vector.Style.Outlined"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
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 2f7bf6120a..704f387062 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/messageMemberNameView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@+id/messageTimeView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/messageMemberNameView"
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 9d4e738823..d5662303dc 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
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/itemCallCreatorNameTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/itemCallKindTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/itemCallStatusTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -64,7 +64,7 @@
 
         <Button
             android:id="@+id/itemCallAcceptView"
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
@@ -77,7 +77,7 @@
 
         <Button
             android:id="@+id/itemCallRejectView"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
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 4c09b7b9ca..73f0ae45af 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
@@ -10,7 +10,7 @@
 
         <TextView
             android:id="@+id/codeBlockTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="monospace" />
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/codeBlockEditedView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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 74cccd746e..c45149c818 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/roomCreateItemDescription"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 352634041c..29fc757fe2 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -15,7 +15,7 @@
 
     <TextView
         android:id="@+id/itemDayTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index cc7f37179c..38d2cc672b 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -17,7 +17,7 @@
 
     <TextView
         android:id="@+id/itemDefaultTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
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 caa5b7e202..e2ef700b36 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,7 +41,7 @@
     <!-- the media -->
     <TextView
         android:id="@+id/messageFilenameView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index fdbf44d6ad..93347c9de1 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/itemMergedSummaryTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 6d5046f857..bfcad9ebad 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
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/roomNameTileText"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -77,7 +77,7 @@
 
         <TextView
             android:id="@+id/roomNameDescriptionText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -90,7 +90,7 @@
 
         <TextView
             android:id="@+id/roomNameTopicText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -126,7 +126,7 @@
                 android:src="@drawable/ic_add_people" />
 
             <TextView
-                style="@style/VectorTextView.Body"
+                style="@style/TextView.Vector.Body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -156,7 +156,7 @@
 
         <TextView
             android:id="@+id/itemNoticeTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -173,7 +173,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
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 d9cd8b47a5..3b4fa2d6b8 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
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneTitleTextView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/itemVerificationDoneDetailTextView"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/itemMergedExpandTextView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index c19260e3b4..54ab7141be 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -17,7 +17,7 @@
 
     <TextView
         android:id="@+id/itemNoticeTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index 49c47e87fb..251f77323a 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/optionLabelText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
@@ -23,7 +23,7 @@
         <!-- Filled at runtime with buttons -->
         <!--Button
             android:id="@+id/pollButton1"
-            style="@style/VectorButtonStyleOutlined.Poll"
+            style="@style/Button.Vector.Style.Outlined.Poll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Create Github issue" /-->
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 3ef5dc969b..cd9decaceb 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
@@ -23,7 +23,7 @@
 
         <TextView
             android:id="@+id/pollLabelText"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -36,7 +36,7 @@
 
     <Button
         android:id="@+id/pollButton1"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -45,7 +45,7 @@
 
     <Button
         android:id="@+id/pollButton2"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -54,7 +54,7 @@
 
     <Button
         android:id="@+id/pollButton3"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -63,7 +63,7 @@
 
     <Button
         android:id="@+id/pollButton4"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -72,7 +72,7 @@
 
     <Button
         android:id="@+id/pollButton5"
-        style="@style/VectorButtonStyleOutlined.Poll"
+        style="@style/Button.Vector.Style.Outlined.Poll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -134,7 +134,7 @@
 
     <TextView
         android:id="@+id/pollInfosText"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index 63521dd78b..30ace00ae0 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -1,6 +1,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:drawablePadding="8dp"
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 7c2ac4d39a..9da2491595 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
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneTitleTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDoneDetailTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 5713d9dc30..1dcb2bf982 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/messageTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 8af7b6f3ce..05ab145134 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
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemVerificationTitleTextView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemVerificationDetailTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -44,7 +44,7 @@
 
         <Button
             android:id="@+id/sas_verification_verified_decline_button"
-            style="@style/VectorButtonStyle.Destructive"
+            style="@style/Button.Vector.Style.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -52,7 +52,7 @@
 
         <Button
             android:id="@+id/sas_verification_verified_accept_button"
-            style="@style/VectorButtonStyle.Positive"
+            style="@style/Button.Vector.Style.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/accept" />
@@ -61,7 +61,7 @@
 
     <TextView
         android:id="@+id/itemVerificationStatusText"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 780856a5cd..e2100aa4db 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/itemWidgetTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="6dp"
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index c6272d8d9d..a607e60b5d 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -13,7 +13,7 @@
         android:background="@color/notification_accent_color" />
 
     <TextView
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index 024cded8ae..efbe37d525 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/term_name"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
@@ -30,7 +30,7 @@
 
     <TextView
         android:id="@+id/term_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index c326ee8ac2..7365fabdd9 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/itemUnknownRoomName"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="17dp"
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index 3d525407a5..9877cf194b 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/uploadsFileTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -39,7 +39,7 @@
 
     <TextView
         android:id="@+id/uploadsFileSubtitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 7d6c151462..d5162a21e7 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/itemUserId"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/itemUserName"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
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 bd7c838015..754f370315 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/VectorTextView.HeadlineM"
+    style="@style/TextView.Vector.HeadlineM"
     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 4b9f7ca9b9..6360412657 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/VectorTextView.HeadlineM"
+    style="@style/TextView.Vector.HeadlineM"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index efdd90f68d..ef6a66554f 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -33,7 +33,7 @@
 
     <TextView
         android:id="@+id/itemVerificationActionTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -49,7 +49,7 @@
 
     <TextView
         android:id="@+id/itemVerificationActionSubTitle"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_verification_decimal_code.xml b/vector/src/main/res/layout/item_verification_decimal_code.xml
index 0ba114c64b..2f7632ca05 100644
--- a/vector/src/main/res/layout/item_verification_decimal_code.xml
+++ b/vector/src/main/res/layout/item_verification_decimal_code.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/itemVerificationDecimalCode"
-    style="@style/VectorTextView.Title"
+    style="@style/TextView.Vector.Title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index 5d3c8ef4fc..5205c418a3 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.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/itemVerificationNoticeText"
-    style="@style/VectorTextView.Body"
+    style="@style/TextView.Vector.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_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index d7b41967a2..a1cb32a353 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/use_latest_riot"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="start"
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/app_desktop_web"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -67,7 +67,7 @@
 
     <TextView
         android:id="@+id/app_ios_android"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -87,7 +87,7 @@
 
 
     <TextView
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index 6ef3f813ee..b9a3945596 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/itemVerificationWaitingTitle"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="?vctr_content_secondary"
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 f5fdc14c8e..8e6db4570e 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
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/mediaProgressTextView"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index b4cf120b8a..949fdb28c7 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -37,7 +37,7 @@
 
     <TextView
         android:id="@+id/overlayCounterText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/overlayInfoText"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="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 ffb98e5374..5025e2f62e 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -43,7 +43,7 @@
 
                 <TextView
                     android:id="@+id/waitingStatusText"
-                    style="@style/VectorTextView.Body"
+                    style="@style/TextView.Vector.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/option_buttons.xml b/vector/src/main/res/layout/option_buttons.xml
index 6ea394725b..ae49294f2f 100644
--- a/vector/src/main/res/layout/option_buttons.xml
+++ b/vector/src/main/res/layout/option_buttons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/VectorButtonStyleUnelevated.Bot"
+    style="@style/Button.Vector.Style.Unelevated.Bot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:text="Create Github issue" />
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index fbeb0b0ea4..1336de1bb5 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/reactionText"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
         android:layout_marginStart="6dp"
@@ -55,7 +55,7 @@
 
     <TextView
         android:id="@+id/reactionCount"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index f5f9703081..d6a3e5ea7a 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -7,7 +7,7 @@
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/actionUnreadCounterBadgeView"
-        style="@style/VectorTextView.Micro"
+        style="@style/TextView.Vector.Micro"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index e3144d0d25..c27bf9eaa8 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/inviteNameView"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
@@ -35,7 +35,7 @@
 
     <TextView
         android:id="@+id/inviteIdentifierView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -49,7 +49,7 @@
 
     <TextView
         android:id="@+id/inviteLabelView"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
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 3328b40885..c05c1a8da1 100644
--- a/vector/src/main/res/layout/vector_preference_push_rule.xml
+++ b/vector/src/main/res/layout/vector_preference_push_rule.xml
@@ -19,7 +19,7 @@
 
         <TextView
             android:id="@android:id/title"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
@@ -30,7 +30,7 @@
 
         <TextView
             android:id="@android:id/summary"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.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 4cec603b87..b4f96b9115 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/activeConferenceInfo"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/deleteWidgetButton"
@@ -27,7 +27,7 @@
 
     <Button
         android:id="@+id/deleteWidgetButton"
-        style="@style/VectorButtonStyleText.OnPrimary"
+        style="@style/Button.Vector.Style.Text.OnPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/activeConferenceInfo"
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 e6f76a71b3..f8bc436196 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
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/bottomSheetActionTitle"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -54,7 +54,7 @@
 
         <TextView
             android:id="@+id/bottomSheetActionSubTitle"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/view_button_state.xml b/vector/src/main/res/layout/view_button_state.xml
index b6ee7864c9..41a08cbc73 100644
--- a/vector/src/main/res/layout/view_button_state.xml
+++ b/vector/src/main/res/layout/view_button_state.xml
@@ -7,7 +7,7 @@
 
     <Button
         android:id="@+id/buttonStateButtonFlat"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -46,7 +46,7 @@
 
     <Button
         android:id="@+id/buttonStateRetry"
-        style="@style/VectorButtonStyleText"
+        style="@style/Button.Vector.Style.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml
index e3389ddb63..d893b621f5 100644
--- a/vector/src/main/res/layout/view_current_calls.xml
+++ b/vector/src/main/res/layout/view_current_calls.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/currentCallsInfo"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/returnToCallButton"
@@ -27,7 +27,7 @@
 
     <Button
         android:id="@+id/returnToCallButton"
-        style="@style/VectorButtonStyleText.OnPrimary"
+        style="@style/Button.Vector.Style.Text.OnPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/currentCallsInfo"
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index bc66a11dfc..b5bf43c027 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -20,7 +20,7 @@
 
     <TextView
         android:id="@+id/failedMessagesWarningTextView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -49,7 +49,7 @@
 
     <Button
         android:id="@+id/failedMessagesRetryButton"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/view_file_icon.xml b/vector/src/main/res/layout/view_file_icon.xml
index 2d1331a83a..b3989963ac 100644
--- a/vector/src/main/res/layout/view_file_icon.xml
+++ b/vector/src/main/res/layout/view_file_icon.xml
@@ -8,7 +8,7 @@
 
     <ProgressBar
         android:id="@+id/messageFileProgressbar"
-        style="@style/FileProgressBar"
+        style="@style/ProgressBar.Vector.File"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:progress="40" />
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 9cf29dcbfb..7785612127 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,7 +9,7 @@
 
     <TextView
         android:id="@+id/jumpToReadMarkerLabelView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.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_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index a6ee178152..f26625888b 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/VectorTextView.HeadlineM"
+        style="@style/TextView.Vector.HeadlineM"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
@@ -44,7 +44,7 @@
 
     <TextView
         android:id="@+id/view_keys_backup_banner_text_2"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="27dp"
diff --git a/vector/src/main/res/layout/view_notification_area.xml b/vector/src/main/res/layout/view_notification_area.xml
index 7a82dd3381..adc2dad32b 100644
--- a/vector/src/main/res/layout/view_notification_area.xml
+++ b/vector/src/main/res/layout/view_notification_area.xml
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/roomNotificationMessage"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
index 7cd1de858b..856a32c9ca 100644
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ b/vector/src/main/res/layout/view_poll_result_line.xml
@@ -21,7 +21,7 @@
 
     <TextView
         android:id="@+id/pollResultItemLabel"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -32,7 +32,7 @@
 
     <TextView
         android:id="@+id/pollResultItemPercent"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index 9ca38acf59..a6be054289 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/receiptMore"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginEnd="8dp"
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index ae17a62ab5..c88f667ad1 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/receiptMore"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/item_event_message_state_size"
         android:background="@drawable/pill_receipt"
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 dbc59dcc9b..0babfbdab8 100644
--- a/vector/src/main/res/layout/view_room_widgets_banner.xml
+++ b/vector/src/main/res/layout/view_room_widgets_banner.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsLabel"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/activeWidgetsViewAction"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
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 4543cfcb46..a4da54f04f 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/VectorTextView.HeadlineM"
+            style="@style/TextView.Vector.HeadlineM"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
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 1109860c82..31534cf124 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/VectorTextView.Subtitle"
+        style="@style/TextView.Vector.Subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/subTitle"
-        style="@style/VectorTextView.Caption"
+        style="@style/TextView.Vector.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 008372b4c5..b2d0f8a5f4 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/errorMessageView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -75,7 +75,7 @@
 
         <TextView
             android:id="@+id/emptyTitleView"
-            style="@style/VectorTextView.Subtitle"
+            style="@style/TextView.Vector.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -91,7 +91,7 @@
 
         <TextView
             android:id="@+id/emptyMessageView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="220dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
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 6aac00a12d..e34466ccf8 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
@@ -41,7 +41,7 @@
 
         <TextView
             android:id="@+id/memberProfileNameView"
-            style="@style/VectorTextView.Title"
+            style="@style/TextView.Vector.Title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -54,7 +54,7 @@
 
         <TextView
             android:id="@+id/memberProfileIdView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -69,7 +69,7 @@
 
         <TextView
             android:id="@+id/memberProfilePowerLevelView"
-            style="@style/VectorTextView.Caption"
+            style="@style/TextView.Vector.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -83,7 +83,7 @@
 
         <TextView
             android:id="@+id/memberProfileStatusView"
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index 43b6084666..3c4bd7ce80 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/roomProfileNameView"
-        style="@style/VectorTextView.Title"
+        style="@style/TextView.Vector.Title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -44,7 +44,7 @@
 
     <TextView
         android:id="@+id/roomProfileAliasView"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/view_sync_state.xml b/vector/src/main/res/layout/view_sync_state.xml
index 8ae4f4235b..6167a9e4ab 100644
--- a/vector/src/main/res/layout/view_sync_state.xml
+++ b/vector/src/main/res/layout/view_sync_state.xml
@@ -16,7 +16,7 @@
         tools:visibility="visible">
 
         <ProgressBar
-            style="@style/VectorHorizontalProgressBar"
+            style="@style/ProgressBar.Vector.Horizontal"
             android:layout_width="match_parent"
             android:layout_height="14dp"
             android:layout_gravity="center"
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/syncStateNoNetwork"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorError"
@@ -47,7 +47,7 @@
         tools:visibility="visible">
 
         <TextView
-            style="@style/VectorTextView.Body"
+            style="@style/TextView.Vector.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml
index 186d54f799..218b36df96 100644
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@@ -18,7 +18,7 @@
 
     <TextView
         android:id="@+id/url_preview_title"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
@@ -45,7 +45,7 @@
 
     <TextView
         android:id="@+id/url_preview_description"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
@@ -60,7 +60,7 @@
 
     <TextView
         android:id="@+id/url_preview_site"
-        style="@style/VectorTextView.Body"
+        style="@style/TextView.Vector.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"