diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt
index 011a82f9..a30e5597 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt
@@ -137,11 +137,12 @@ fun SearchBar(
                         decorationBox = { innerTextField ->
                             // Showing placeholder only when there is query is empty
                             if (value.isEmpty()) {
+                                innerTextField()
                                 Text(
                                     modifier = Modifier.alpha(0.7f),
                                     text = stringResource(id = R.string.search_bar_placeholder),
                                     style = MaterialTheme.typography.titleLarge,
-                                    color = MaterialTheme.colorScheme.outline
+                                    color = MaterialTheme.colorScheme.onSurface
                                 )
                             } else {
                                 innerTextField()
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 53773e1d..0cb1c29a 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.primary
+                            color = MaterialTheme.colorScheme.onPrimaryContainer
                         )
                     }
                     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 8eff1698..43b232e0 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
@@ -9,10 +9,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -68,7 +65,7 @@ fun AlertDialogWithList(
         },
         confirmButton = {
             TextButton(onClick = dismissAction) {
-                Text(text = dismissButtonLabel)
+                Text(text = dismissButtonLabel, color = MaterialTheme.colorScheme.onPrimaryContainer)
             }
         }
     )
@@ -100,7 +97,11 @@ private fun CustomDialogContentListItem(
     ) {
         RadioButton(
             selected = selected,
-            onClick = onClick
+            onClick = onClick,
+            colors = RadioButtonDefaults.colors(
+                selectedColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                unselectedColor = MaterialTheme.colorScheme.onPrimaryContainer
+            )
         )
         Text(
             text = label
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 8cf4e9d0..6a5aa2ec 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
@@ -76,7 +76,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.primary
+                            color = MaterialTheme.colorScheme.onPrimaryContainer
                         )
                         SettingsListItem(
                             label = stringResource(R.string.precision_setting),
@@ -110,7 +110,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.primary
+                            color = MaterialTheme.colorScheme.onPrimaryContainer
                         )
                         SettingsListItem(
                             label = stringResource(R.string.terms_and_conditions),