diff --git a/android/app/src/main/res/layout/item_feature_category_footer.xml b/android/app/src/main/res/layout/item_feature_category_footer.xml
index 3ba0c67ff..2e0fc5182 100644
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -14,7 +14,7 @@
     android:gravity="center"
     android:maxWidth="500dp"
     android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.MdcTypographyStyles.Headline6"
+    android:textAppearance="@style/TextAppearance.Headline6"
     android:textStyle="bold" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/editor_category_unsuitable_text"
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 7db179ede..314aeed2d 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -88,19 +88,19 @@
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
     <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
     <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
     <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.Body2</item>
+    <item name="fontButton">@style/TextAppearance.Button</item>
+    <item name="fontCaption">@style/TextAppearance.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/white_secondary</item>
diff --git a/android/app/src/main/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml
index 6e1577bcc..5994fd852 100644
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -31,7 +31,7 @@
     <item name="android:fontFamily">@string/robotoMedium</item>
   </style>
 
-  <style name="MwmTextAppearance.Body1" parent="TextAppearance.MaterialComponents.Headline6">
+  <style name="MwmTextAppearance.Body1" parent="TextAppearance.Material3.BodyLarge">
     <item name="android:textSize">@dimen/text_size_body_1</item>
     <item name="android:textColor">?android:textColorPrimary</item>
   </style>
@@ -40,11 +40,11 @@
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body1.Light" parent="TextAppearance.MaterialComponents.Headline6">
+  <style name="MwmTextAppearance.Body1.Light" parent="TextAppearance.Material3.BodyLarge">
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
 
-  <style name="MwmTextAppearance.Body2" parent="android:TextAppearance.Material.Medium">
+  <style name="MwmTextAppearance.Body2" parent="TextAppearance.Material3.BodyMedium">
     <item name="android:textSize">@dimen/text_size_body_2</item>
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
@@ -53,7 +53,7 @@
     <item name="android:textColor">?android:textColorPrimary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body2.Light" parent="android:TextAppearance.Material.Medium.Inverse">
+  <style name="MwmTextAppearance.Body2.Light" parent="TextAppearance.Material3.BodyMedium">
     <item name="android:textSize">@dimen/text_size_body_2</item>
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
@@ -63,7 +63,7 @@
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body3">
+  <style name="MwmTextAppearance.Body3" parent="TextAppearance.Material3.BodySmall">
     <item name="android:textSize">@dimen/text_size_body_3</item>
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
@@ -73,17 +73,17 @@
     <item name="android:textColor">?android:textColorPrimary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body3.Light" parent="android:TextAppearance.Material.Inverse">
+  <style name="MwmTextAppearance.Body3.Light" parent="TextAppearance.Material3.BodySmall">
     <item name="android:textSize">@dimen/text_size_body_3</item>
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
 
-  <style name="MwmTextAppearance.Body4" parent="TextAppearance.MaterialComponents.Subtitle2">
+  <style name="MwmTextAppearance.Body4" parent="TextAppearance.Material3.TitleSmall">
     <item name="android:textSize">@dimen/text_size_body_4</item>
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
 
-  <style name="MwmTextAppearance.Body4.Light" parent="TextAppearance.MaterialComponents.Subtitle2">
+  <style name="MwmTextAppearance.Body4.Light" parent="TextAppearance.Material3.TitleSmall">
     <item name="android:textSize">@dimen/text_size_body_4</item>
     <item name="android:textColor">?android:textColorPrimaryInverse</item>
   </style>
@@ -190,91 +190,91 @@
     <item name="android:textColor">@color/white_secondary</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline1"
-    parent="TextAppearance.MaterialComponents.Headline1">
+  <style name="TextAppearance.Headline1"
+    parent="TextAppearance.Material3.DisplayLarge">
     <item name="fontFamily">@string/robotoLight</item>
     <item name="android:fontFamily">@string/robotoLight</item>
     <item name="android:textSize">96sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline2"
-    parent="TextAppearance.MaterialComponents.Headline2">
+  <style name="TextAppearance.Headline2"
+    parent="TextAppearance.Material3.DisplayLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">60sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline3"
-    parent="TextAppearance.MaterialComponents.Headline3">
+  <style name="TextAppearance.Headline3"
+    parent="TextAppearance.Material3.DisplayMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">48sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline4"
-    parent="TextAppearance.MaterialComponents.Headline4">
+  <style name="TextAppearance.Headline4"
+    parent="TextAppearance.Material3.HeadlineLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">34sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline5"
-    parent="TextAppearance.MaterialComponents.Headline5">
+  <style name="TextAppearance.Headline5"
+    parent="TextAppearance.Material3.HeadlineMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">24sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Headline6"
-    parent="TextAppearance.MaterialComponents.Headline6">
+  <style name="TextAppearance.Headline6"
+    parent="TextAppearance.Material3.HeadlineSmall">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">20sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Subtitle1"
-    parent="TextAppearance.MaterialComponents.Subtitle1">
+  <style name="TextAppearance.Subtitle1"
+    parent="TextAppearance.Material3.TitleMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">16sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Subtitle2"
-    parent="TextAppearance.MaterialComponents.Subtitle2">
+  <style name="TextAppearance.Subtitle2"
+    parent="TextAppearance.Material3.TitleSmall">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">14sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Body1"
-    parent="TextAppearance.MaterialComponents.Body1">
+  <style name="TextAppearance.Body1"
+    parent="TextAppearance.Material3.BodyLarge">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">16sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Body2"
-    parent="TextAppearance.MaterialComponents.Body2">
+  <style name="TextAppearance.Body2"
+    parent="TextAppearance.Material3.BodyMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">14sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Button"
+  <style name="TextAppearance.Button"
     parent="TextAppearance.MaterialComponents.Button">
     <item name="fontFamily">@string/robotoMedium</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textSize">14sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Caption"
-    parent="TextAppearance.MaterialComponents.Caption">
+  <style name="TextAppearance.Caption"
+    parent="TextAppearance.Material3.LabelMedium">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:textSize">12sp</item>
   </style>
 
-  <style name="TextAppearance.MdcTypographyStyles.Overline"
+  <style name="TextAppearance.Overline"
     parent="TextAppearance.MaterialComponents.Overline">
     <item name="fontFamily">@string/robotoRegular</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index c06330815..3336929e7 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -93,19 +93,19 @@
     <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
     <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
     <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
-    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
     <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.Body2</item>
+    <item name="fontButton">@style/TextAppearance.Button</item>
+    <item name="fontCaption">@style/TextAppearance.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.Overline</item>
     <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
     <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/black_secondary</item>