diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
index 0692a25..b58b9ce 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
@@ -7,6 +7,7 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.jetpackduba.gitnuro.theme.textButtonColors
@@ -83,21 +84,18 @@ fun RebaseStateLoaded(
             }
         }
 
-        Row(modifier = Modifier.padding(bottom = 16.dp)) {
+        Row(
+            modifier = Modifier.padding(bottom = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
             Spacer(modifier = Modifier.weight(1f))
-            TextButton(
+            PrimaryButton(
+                text = "Cancel",
                 modifier = Modifier.padding(end = 8.dp),
-                onClick = {
-                    onCancel()
-                },
-                colors = textButtonColors(),
-            ) {
-                Text(
-                    text = "Cancel",
-                    color = MaterialTheme.colors.onBackground,
-                    style = MaterialTheme.typography.body1,
-                )
-            }
+                onClick = onCancel,
+                backgroundColor = Color.Transparent,
+                textColor = MaterialTheme.colors.onBackground,
+            )
             PrimaryButton(
                 modifier = Modifier.padding(end = 16.dp),
                 enabled = stepsList.any { it.action != Action.PICK },
@@ -130,6 +128,7 @@ fun RebaseCommit(
         modifier = Modifier
             .padding(horizontal = 16.dp, vertical = 8.dp)
             .height(IntrinsicSize.Min)
+            .fillMaxWidth()
     ) {
         ActionDropdown(
             rebaseLine.action,
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
index 1345dbd..a2200d2 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
@@ -55,13 +55,15 @@ fun AdjustableOutlinedTextField(
     val indicatorColor by colors.indicatorColor(enabled, isError, interactionSource)
 
     Box(
-        modifier = Modifier
+        modifier = modifier
             .height(IntrinsicSize.Min)
+            .background(Color.Red)
     ) {
         BasicTextField(
-            modifier = modifier
+            modifier = Modifier
                 .heightIn(min = 40.dp)
-                .background(backgroundColor),
+                .background(backgroundColor)
+                .fillMaxWidth(),
             value = value,
             onValueChange = onValueChange,
             enabled = enabled,
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/PrimaryButton.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/PrimaryButton.kt
index a30da4d..e603051 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/PrimaryButton.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/PrimaryButton.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -37,8 +38,9 @@ fun PrimaryButton(
                         onClick()
                     }
                 } else
-                    handOnHover()
+                    this
             },
+        contentAlignment = Alignment.Center,
     ) {
         Text(
             text,
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt
index 56d34d1..8bdeb67 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/AuthorDialog.kt
@@ -106,6 +106,7 @@ fun AuthorDialog(
                     modifier = Modifier.padding(end = 8.dp),
                     onClick = onClose,
                     backgroundColor = Color.Transparent,
+                    textColor = MaterialTheme.colors.onBackground,
                 )
                 PrimaryButton(
                     onClick = {
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt
index 0ae0321..237df1b 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/CloneDialog.kt
@@ -207,7 +207,8 @@ private fun CloneInput(
                         next = urlFocusRequester
                     },
                 onClick = onClose,
-                backgroundColor = Color.Transparent
+                backgroundColor = Color.Transparent,
+                textColor = MaterialTheme.colors.onBackground,
             )
             PrimaryButton(
                 onClick = {
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
index c24264a..074fe39 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
@@ -91,7 +91,8 @@ fun NewBranchDialog(
                     text = "Cancel",
                     modifier = Modifier.padding(end = 8.dp),
                     onClick = onClose,
-                    backgroundColor = Color.Transparent
+                    backgroundColor = Color.Transparent,
+                    textColor = MaterialTheme.colors.onBackground,
                 )
                 PrimaryButton(
                     modifier = Modifier
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
index c48c47f..5d7bfa6 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
@@ -91,7 +91,8 @@ fun NewTagDialog(
                     text = "Cancel",
                     modifier = Modifier.padding(end = 8.dp),
                     onClick = onReject,
-                    backgroundColor = Color.Transparent
+                    backgroundColor = Color.Transparent,
+                    textColor = MaterialTheme.colors.onBackground,
                 )
                 PrimaryButton(
                     modifier = Modifier
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
index e46365e..5d62f25 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt
@@ -97,7 +97,8 @@ fun PasswordDialog(
                     text = "Cancel",
                     modifier = Modifier.padding(end = 8.dp),
                     onClick = onReject,
-                    backgroundColor = Color.Transparent
+                    backgroundColor = Color.Transparent,
+                    textColor = MaterialTheme.colors.onBackground,
                 )
                 PrimaryButton(
                     modifier = Modifier
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
index e379bb1..ffafa15 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt
@@ -96,7 +96,8 @@ fun ResetBranchDialog(
                     text = "Cancel",
                     modifier = Modifier.padding(end = 8.dp),
                     onClick = onReject,
-                    backgroundColor = Color.Transparent
+                    backgroundColor = Color.Transparent,
+                    textColor = MaterialTheme.colors.onBackground,
                 )
                 PrimaryButton(
                     onClick = {
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
index f8a8b1e..a30a662 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
@@ -91,7 +91,8 @@ fun StashWithMessageDialog(
                     text = "Cancel",
                     modifier = Modifier.padding(end = 8.dp),
                     onClick = onClose,
-                    backgroundColor = Color.Transparent
+                    backgroundColor = Color.Transparent,
+                    textColor = MaterialTheme.colors.onBackground,
                 )
                 PrimaryButton(
                     modifier = Modifier
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
index 903d5ff..b981fc3 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/UserPasswordDialog.kt
@@ -122,7 +122,8 @@ fun UserPasswordDialog(
                     text = "Cancel",
                     modifier = Modifier.padding(end = 8.dp),
                     onClick = onReject,
-                    backgroundColor = Color.Transparent
+                    backgroundColor = Color.Transparent,
+                    textColor = MaterialTheme.colors.onBackground,
                 )
                 PrimaryButton(
                     modifier = Modifier