diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/EntireScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/EntireScreen.kt
index 8d70721d..9f09e6bf 100644
--- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/EntireScreen.kt
+++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/EntireScreen.kt
@@ -73,8 +73,10 @@ internal fun EntireScreen(
                 navigateUp = { navigator.navigateUp() },
                 action = {
                     Icon(
-                        modifier = Modifier.clickable { navigator.navigateToSetting() },
-                        imageVector = ImageVector.vectorResource(R.drawable.setting),
+                        modifier = Modifier
+                            .clickable { navigator.navigateToSetting() }
+                            .padding(end = 16.dp),
+                        imageVector = ImageVector.vectorResource(R.drawable.ic_setting),
                         contentDescription = stringResource(R.string.setting_icon),
                         tint = WeSpotThemeManager.colors.secondaryBtnColor,
                     )
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/SettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/SettingScreen.kt
index 13342f20..b0ae74fe 100644
--- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/SettingScreen.kt
+++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/SettingScreen.kt
@@ -43,8 +43,10 @@ fun SettingScreen(
                 navigateUp = { navigator.navigateUp() },
                 action = {
                     Icon(
-                        modifier = Modifier.clickable { navigator.navigateToNotificationSetting() },
-                        imageVector = ImageVector.vectorResource(R.drawable.setting),
+                        modifier = Modifier
+                            .padding(end = 16.dp)
+                            .clickable { navigator.navigateToNotificationSetting() },
+                        imageVector = ImageVector.vectorResource(R.drawable.ic_setting),
                         contentDescription = stringResource(R.string.setting_icon),
                         tint = WeSpotThemeManager.colors.secondaryBtnColor,
                     )