diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt
index 289f09ce4d..66ff4a25ee 100644
--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt
+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt
@@ -35,40 +35,40 @@ internal val NiaTypography = Typography(
         fontSize = 57.sp,
         lineHeight = 64.sp,
         letterSpacing = (-0.25).sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     displayMedium = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 45.sp,
         lineHeight = 52.sp,
         letterSpacing = 0.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     displaySmall = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 36.sp,
         lineHeight = 44.sp,
         letterSpacing = 0.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     headlineLarge = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 32.sp,
         lineHeight = 40.sp,
         letterSpacing = 0.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     headlineMedium = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 28.sp,
         lineHeight = 36.sp,
         letterSpacing = 0.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     headlineSmall = TextStyle(
         fontWeight = FontWeight.Normal,
@@ -79,8 +79,8 @@ internal val NiaTypography = Typography(
             alignment = Alignment.Bottom,
             trim = Trim.None,
         ),
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     titleLarge = TextStyle(
         fontWeight = FontWeight.Bold,
@@ -91,24 +91,24 @@ internal val NiaTypography = Typography(
             alignment = Alignment.Bottom,
             trim = Trim.LastLineBottom,
         ),
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     titleMedium = TextStyle(
         fontWeight = FontWeight.Bold,
         fontSize = 18.sp,
         lineHeight = 24.sp,
         letterSpacing = 0.1.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     titleSmall = TextStyle(
         fontWeight = FontWeight.Medium,
         fontSize = 14.sp,
         lineHeight = 20.sp,
         letterSpacing = 0.1.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     // Default text style
     bodyLarge = TextStyle(
@@ -120,24 +120,24 @@ internal val NiaTypography = Typography(
             alignment = Alignment.Center,
             trim = Trim.None,
         ),
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     bodyMedium = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 14.sp,
         lineHeight = 20.sp,
         letterSpacing = 0.25.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     bodySmall = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 12.sp,
         lineHeight = 16.sp,
         letterSpacing = 0.4.sp,
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     // Used for Button
     labelLarge = TextStyle(
@@ -149,8 +149,8 @@ internal val NiaTypography = Typography(
             alignment = Alignment.Center,
             trim = Trim.LastLineBottom,
         ),
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     // Used for Navigation items
     labelMedium = TextStyle(
@@ -162,8 +162,8 @@ internal val NiaTypography = Typography(
             alignment = Alignment.Center,
             trim = Trim.LastLineBottom,
         ),
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
     // Used for Tag
     labelSmall = TextStyle(
@@ -175,7 +175,7 @@ internal val NiaTypography = Typography(
             alignment = Alignment.Center,
             trim = Trim.LastLineBottom,
         ),
-        textDirection = TextDirection.Ltr,
-        textAlign = TextAlign.Left,
+        textDirection = TextDirection.ContentOrLtr,
+        textAlign = TextAlign.Start,
     ),
 )