diff --git a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt
index f41c9a3..4523c82 100644
--- a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt
+++ b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt
@@ -90,16 +90,16 @@ fun DmsLargeTopAppBar(
             .fillMaxWidth()
             .background(DmsTheme.colors.background),
     ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(
-                    horizontal = 16.dp,
-                    vertical = 12.dp,
-                ),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            onBackPressed?.let {
+        onBackPressed?.let {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(
+                        horizontal = 16.dp,
+                        vertical = 12.dp,
+                    ),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
                 DmsIconButton(
                     resource = DmsIcon.ArrowBack,
                     tint = DmsTheme.colors.surfaceContainerLow,
diff --git a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt
index 442a4c1..8832cf7 100644
--- a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt
+++ b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt
@@ -15,12 +15,13 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.painterResource
+import team.aliens.dms.kmp.core.designsystem.foundation.DmsTheme
 
 @Composable
 fun DmsIconButton(
     modifier: Modifier = Modifier,
     resource: DrawableResource,
-    tint: Color,
+    tint: Color = DmsTheme.colors.surfaceContainerLow,
     enabled: Boolean = true,
     size: Dp = 24.dp,
     contentDescription: String? = null,
diff --git a/feature/application/build.gradle.kts b/feature/application/build.gradle.kts
index 558a1ef..be7bbec 100644
--- a/feature/application/build.gradle.kts
+++ b/feature/application/build.gradle.kts
@@ -42,6 +42,10 @@ kotlin {
             implementation(compose.material3)
             implementation(compose.ui)
             implementation(libs.navigation.compose)
+            implementation(compose.components.resources)
+
+            implementation(projects.core.designSystem)
+            implementation(projects.core.common)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)
diff --git a/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt b/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt
index e7754aa..226d0e5 100644
--- a/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt
+++ b/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt
@@ -111,16 +111,12 @@ private fun AllAgreeButton(
     onAllAgreeButtonClick: (Boolean) -> Unit,
 ) {
     var isCheck by remember { mutableStateOf(buttonEnabled) }
-    val background = if (isCheck) {
-        DmsTheme.colors.onSecondary
+    val (background, contentColor) = if (isCheck) {
+        DmsTheme.colors.onSecondary to DmsTheme.colors.surfaceContainerHighest
     } else {
-        DmsTheme.colors.onBackground
-    }
-    val contentColor = if (isCheck) {
-        DmsTheme.colors.surfaceContainerHighest
-    } else {
-        DmsTheme.colors.onSurface
+        DmsTheme.colors.onBackground to DmsTheme.colors.onSurface
     }
+
     Row(
         modifier = Modifier
             .fillMaxWidth()