diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt
index 2ae852d0..82979c7a 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt
@@ -52,7 +52,7 @@ fun UnitsList(
                                 .padding(vertical = 12.dp, horizontal = 8.dp),
                             text = stringResource(id = unitGroup.res),
                             style = MaterialTheme.typography.titleMedium,
-                            color = MaterialTheme.colorScheme.onPrimaryContainer
+                            color = MaterialTheme.colorScheme.primary
                         )
                     }
                     items(items = listOfUnits, key = { it.unitId }) { unit ->
diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/AlertDialogWithList.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/AlertDialogWithList.kt
index 0a069eed..9b41c6a2 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/setttings/AlertDialogWithList.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/AlertDialogWithList.kt
@@ -70,7 +70,7 @@ fun AlertDialogWithList(
         },
         confirmButton = {
             TextButton(onClick = dismissAction) {
-                Text(text = dismissButtonLabel, color = MaterialTheme.colorScheme.onPrimaryContainer)
+                Text(text = dismissButtonLabel, color = MaterialTheme.colorScheme.primary)
             }
         }
     )
diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
index 6f61fc8f..7038d3c7 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
@@ -89,7 +89,7 @@ fun SettingsScreen(
                                 .padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp),
                             text = stringResource(id = R.string.general_settings_group),
                             style = MaterialTheme.typography.titleSmall,
-                            color = MaterialTheme.colorScheme.onPrimaryContainer
+                            color = MaterialTheme.colorScheme.primary
                         )
                         SettingsListItem(
                             label = stringResource(R.string.precision_setting),
@@ -123,7 +123,7 @@ fun SettingsScreen(
                                 .padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp),
                             text = stringResource(id = R.string.additional_settings_group),
                             style = MaterialTheme.typography.titleSmall,
-                            color = MaterialTheme.colorScheme.onPrimaryContainer
+                            color = MaterialTheme.colorScheme.primary
                         )
                         SettingsListItem(
                             label = stringResource(R.string.terms_and_conditions),
diff --git a/app/src/main/java/com/sadellie/unitto/ui/theme/ColorSchemeUtils.kt b/app/src/main/java/com/sadellie/unitto/ui/theme/ColorSchemeUtils.kt
index 7d054c9a..c1eb6a2c 100644
--- a/app/src/main/java/com/sadellie/unitto/ui/theme/ColorSchemeUtils.kt
+++ b/app/src/main/java/com/sadellie/unitto/ui/theme/ColorSchemeUtils.kt
@@ -75,9 +75,10 @@ fun dynamicLightTheme(context: Context): ColorScheme {
 
             return lightColorScheme(
                 // Settings screen group text, units screen units group text
-                primary = primary.shiftTo0(0.7f),
+                primary = primary,
                 // Text color on Third party Licenses screen
                 onPrimary = primary.shiftTo255(0.3f),
+                onPrimaryContainer = primary.shiftTo0(0.7f),
                 // Selected unit, group, keyboard buttons
                 secondaryContainer = secondary,
                 onSecondaryContainer = secondary.getAppropriateTextColor(),
@@ -130,9 +131,10 @@ fun dynamicDarkTheme(context: Context): ColorScheme {
 
             return darkColorScheme(
                 // Settings screen group text, units screen units group text
-                primary = primary.shiftTo255(0.7f),
+                primary = primary,
                 // Text color on Third party Licenses screen
                 onPrimary = primary.shiftTo0(0.3f),
+                onPrimaryContainer = primary.shiftTo255(0.7f),
                 // Selected unit, group, keyboard buttons
                 secondaryContainer = secondary,
                 onSecondaryContainer = secondary.getAppropriateTextColor(),