diff --git a/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt b/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt
index e136c048..1e156fb1 100644
--- a/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/theme/Color.kt
@@ -9,7 +9,7 @@ private fun hslColor(hue: Float, saturation: Float, lightness: Float): Color =
 val primaryDark = hslColor(260f, 85f, 60f)
 val onPrimaryDark = hslColor(255f, 0f, 100f)
 val secondaryDark = hslColor(255f, 0f, 40f)
-val onSecondaryDark = hslColor(255f, 10f, 88f)
+val onSecondaryDark = hslColor(255f, 0f, 100f)
 val tertiaryDark = hslColor(255f, 0f, 65f)
 val onTertiaryDark = hslColor(255f, 0f, 12f)
 val errorDark = hslColor(7f, 100f, 84f)
@@ -17,9 +17,9 @@ val onErrorDark = hslColor(357f, 100f, 21f)
 val errorContainerDark = hslColor(355f, 100f, 29f)
 val onErrorContainerDark = hslColor(6f, 100f, 92f)
 val backgroundDark = hslColor(255f, 10f, 8f)
-val onBackgroundDark = hslColor(255f, 60f, 94f)
+val onBackgroundDark = hslColor(255f, 0f, 100f)
 val surfaceDark = hslColor(255f, 10f, 16f)
-val onSurfaceDark = hslColor(255f, 10f, 92f)
+val onSurfaceDark = hslColor(255f, 0f, 100f)
 val primaryContainerDark = primaryDark
 val onPrimaryContainerDark = onPrimaryDark
 val secondaryContainerDark = secondaryDark
diff --git a/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt
index 4851ffed..ed479e76 100644
--- a/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt
+++ b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt
@@ -24,8 +24,8 @@ fun PurefinIconButton(
     CircularIconButton(
         icon = icon,
         contentDescription = contentDescription,
-        containerColor = scheme.secondary,
-        focusedBackgroundColor = focusedBackgroundColor ?: scheme.secondary,
+        containerColor = scheme.surface,
+        focusedBackgroundColor = focusedBackgroundColor ?: scheme.surface,
         iconColor = scheme.onSecondary,
         size = size.dp,
         onClick = onClick,