diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ImageViewerDialog.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ImageViewerDialog.kt
index d5c84cd3..398d8562 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ImageViewerDialog.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ImageViewerDialog.kt
@@ -204,7 +204,7 @@ fun ImageViewerDialog(
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = stringResource(R.string.image_viewer_close),
-                            tint = MaterialTheme.colorScheme.onPrimary,
+                            tint = MaterialTheme.colorScheme.onSurface,
                         )
                     }
                     Row {
@@ -212,21 +212,21 @@ fun ImageViewerDialog(
                             CircularProgressIndicator(
                                 modifier = Modifier.size(24.dp).padding(horizontal = 8.dp),
                                 strokeWidth = 2.dp,
-                                color = MaterialTheme.colorScheme.onPrimary,
+                                color = MaterialTheme.colorScheme.onSurface,
                             )
                         } else {
                             IconButton(onClick = onSave, enabled = !isBusy) {
                                 Icon(
                                     imageVector = Icons.Filled.Download,
                                     contentDescription = stringResource(R.string.image_viewer_save),
-                                    tint = MaterialTheme.colorScheme.onPrimary,
+                                    tint = MaterialTheme.colorScheme.onSurface,
                                 )
                             }
                             IconButton(onClick = onShare, enabled = !isBusy) {
                                 Icon(
                                     imageVector = Icons.Filled.Share,
                                     contentDescription = stringResource(R.string.image_viewer_share),
-                                    tint = MaterialTheme.colorScheme.onPrimary,
+                                    tint = MaterialTheme.colorScheme.onSurface,
                                 )
                             }
                         }