diff --git a/app/src/main/java/eu/gaudian/translator/view/composable/AppTopAppBar.kt b/app/src/main/java/eu/gaudian/translator/view/composable/AppTopAppBar.kt
index fa52d4c..3595ee5 100644
--- a/app/src/main/java/eu/gaudian/translator/view/composable/AppTopAppBar.kt
+++ b/app/src/main/java/eu/gaudian/translator/view/composable/AppTopAppBar.kt
@@ -10,11 +10,13 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBackIosNew
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -94,17 +96,15 @@ fun AppTopAppBar(
             if (onNavigateBack != null) {
                 IconButton(
                     onClick = onNavigateBack,
-                    modifier = Modifier.padding(start = 8.dp),
-                    // This tells the button to paint its own circular background natively
-                    colors = IconButtonDefaults.iconButtonColors(
-                        containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
-                        contentColor = MaterialTheme.colorScheme.primary
-                    )
+                    modifier = Modifier
+                        .clip(CircleShape)
+                        .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f))
                 ) {
                     Icon(
-                        imageVector = AppIcons.ArrowBack,
-                        contentDescription = stringResource(R.string.cd_navigate_back)
-                        // Notice we removed the 'tint' here, as contentColor handles it perfectly now!
+                        imageVector = Icons.Default.ArrowBackIosNew,
+                        contentDescription = "Back",
+                        modifier = Modifier.size(18.dp),
+                        tint = MaterialTheme.colorScheme.primary
                     )
                 }
             } else if (navigationIcon != null) {