diff --git a/package-lock.json b/package-lock.json
index c8ca368c17f..2374b848438 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11940,9 +11940,9 @@
             }
         },
         "node_modules/@aws/mynah-ui": {
-            "version": "4.31.0-beta.3",
-            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.31.0-beta.3.tgz",
-            "integrity": "sha512-TkjZ/t2352fsNsPfGxyPlwoq1Y+PuEl51dc405GTzx1dIeUPFsNPha6qvDAdxhPDZyyeOviqJXXGtQBWTHcEBg==",
+            "version": "4.31.0-beta.5",
+            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.31.0-beta.5.tgz",
+            "integrity": "sha512-JrOHikPQgFKcP1E7hqzacjoWDP/HgPr4KdlJDXDF4Qc/sZVsN63aJoIGILmW6jW8P+oN6Yr7YlmJMrvFC+WvkQ==",
             "hasInstallScript": true,
             "license": "Apache License 2.0",
             "dependencies": {
@@ -26777,7 +26777,7 @@
                 "@aws-sdk/s3-request-presigner": "<3.731.0",
                 "@aws-sdk/smithy-client": "<3.731.0",
                 "@aws-sdk/util-arn-parser": "<3.731.0",
-                "@aws/mynah-ui": "^4.31.0-beta.3",
+                "@aws/mynah-ui": "^4.31.0-beta.5",
                 "@gerhobbelt/gitignore-parser": "^0.2.0-9",
                 "@iarna/toml": "^2.2.5",
                 "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/core/package.json b/packages/core/package.json
index f4ca3f6d5a5..61ebf040114 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -525,7 +525,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.31.0-beta.3",
+        "@aws/mynah-ui": "^4.31.0-beta.5",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
index c8fd3256924..2e02c2037fb 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -816,7 +816,7 @@ export class Messenger {
                 {
                     id: 'reject-code-diff',
                     status: 'clear',
-                    icon: 'revert' as MynahIconsType,
+                    icon: 'undo' as MynahIconsType,
                     text: 'Undo',
                 },
             ]
@@ -860,7 +860,7 @@ export class Messenger {
             new ChatMessage(
                 {
                     message: message,
-                    messageType: 'answer-part',
+                    messageType: toolUse?.name === ToolType.FsWrite ? 'answer' : 'answer-part',
                     followUps: undefined,
                     followUpsHeader: undefined,
                     relatedSuggestions: undefined,