diff --git a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/components/documents/DocumentStates.kt b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/components/documents/DocumentStates.kt
index 080d834..6dde4df 100644
--- a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/components/documents/DocumentStates.kt
+++ b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/components/documents/DocumentStates.kt
@@ -35,7 +35,7 @@ fun ErrorState(message: String, onRetry: () -> Unit) {
         Spacer(modifier = Modifier.height(16.dp))
         Text(message, style = MaterialTheme.typography.bodyLarge, color = Color.Gray)
         Spacer(modifier = Modifier.height(16.dp))
-        Button(onClick = onRetry) {
+        OutlinedButton(onClick = onRetry) {
             Text("Retry")
         }
     }
diff --git a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentDetailScreen.kt
index 3367cd9..a35384e 100644
--- a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentDetailScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentDetailScreen.kt
@@ -578,7 +578,7 @@ fun DocumentImageViewer(
                                 modifier = Modifier.fillMaxWidth(),
                                 horizontalArrangement = Arrangement.SpaceBetween
                             ) {
-                                Button(
+                                OutlinedButton(
                                     onClick = { selectedIndex = (selectedIndex - 1 + images.size) % images.size },
                                     enabled = selectedIndex > 0
                                 ) {
@@ -586,7 +586,7 @@ fun DocumentImageViewer(
                                     Spacer(modifier = Modifier.width(OrganicSpacing.sm))
                                     Text("Previous")
                                 }
-                                Button(
+                                OutlinedButton(
                                     onClick = { selectedIndex = (selectedIndex + 1) % images.size },
                                     enabled = selectedIndex < images.size - 1
                                 ) {
diff --git a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentFormScreen.kt b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentFormScreen.kt
index 5445edb..dc46483 100644
--- a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentFormScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/DocumentFormScreen.kt
@@ -552,7 +552,7 @@ fun DocumentFormScreen(
                         Row(
                             horizontalArrangement = Arrangement.spacedBy(OrganicSpacing.compact)
                         ) {
-                            Button(
+                            OutlinedButton(
                                 onClick = { cameraPicker() },
                                 modifier = Modifier.weight(1f),
                                 enabled = selectedImages.size < maxImages
@@ -562,7 +562,7 @@ fun DocumentFormScreen(
                                 Text(stringResource(Res.string.documents_form_camera))
                             }
 
-                            Button(
+                            OutlinedButton(
                                 onClick = { imagePicker() },
                                 modifier = Modifier.weight(1f),
                                 enabled = selectedImages.size < maxImages
diff --git a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/onboarding/OnboardingFirstTaskContent.kt b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/onboarding/OnboardingFirstTaskContent.kt
index 2302aa5..92f34ef 100644
--- a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/onboarding/OnboardingFirstTaskContent.kt
+++ b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/onboarding/OnboardingFirstTaskContent.kt
@@ -796,7 +796,7 @@ private fun ErrorPane(
                 OutlinedButton(onClick = onSkip) {
                     Text("Skip for now")
                 }
-                Button(onClick = onRetry) {
+                OutlinedButton(onClick = onRetry) {
                     Icon(Icons.Default.Refresh, contentDescription = null, modifier = Modifier.size(18.dp))
                     Spacer(modifier = Modifier.width(OrganicSpacing.xs))
                     Text("Retry")
diff --git a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskSuggestionsScreen.kt b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskSuggestionsScreen.kt
index a887edd..e735516 100644
--- a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskSuggestionsScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskSuggestionsScreen.kt
@@ -301,7 +301,7 @@ private fun ErrorView(message: String, onRetry: () -> Unit) {
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant
         )
-        Button(onClick = onRetry) { Text("Retry") }
+        OutlinedButton(onClick = onRetry) { Text("Retry") }
     }
 }
 
diff --git a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskTemplatesBrowserScreen.kt b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskTemplatesBrowserScreen.kt
index cbd8fd1..0969b13 100644
--- a/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskTemplatesBrowserScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/task/TaskTemplatesBrowserScreen.kt
@@ -465,7 +465,7 @@ private fun LoadErrorView(
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant
         )
-        Button(onClick = onRetry) {
+        OutlinedButton(onClick = onRetry) {
             Text(stringResource(Res.string.templates_retry))
         }
     }