diff --git a/package-lock.json b/package-lock.json
index e6398b8a97b..fd4752af2f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11957,9 +11957,9 @@
             }
         },
         "node_modules/@aws/mynah-ui": {
-            "version": "4.27.0",
-            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.27.0.tgz",
-            "integrity": "sha512-DkwenNLU+BHUYf0ntwkGllfjM+LrQXvCTiV2Eh7zV3HA59+ba5e34zge3sf7F71XukR9ckoKHXrxc0GjvVchbA==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.30.0.tgz",
+            "integrity": "sha512-ZUje97UxfhrxWoT8P4qKs3qRUq0c92gwFNxR6c4szpRZeEchPTqDP/HIX5KE6AEIeMFyiHx/qgDjmuNIc3kZyw==",
             "hasInstallScript": true,
             "dependencies": {
                 "escape-html": "^1.0.3",
@@ -26756,7 +26756,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.27.0",
+                "@aws/mynah-ui": "^4.30.0",
                 "@gerhobbelt/gitignore-parser": "^0.2.0-9",
                 "@iarna/toml": "^2.2.5",
                 "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-2daaf655-9a45-4104-94f9-06b9d8c703e2.json b/packages/amazonq/.changes/next-release/Bug Fix-2daaf655-9a45-4104-94f9-06b9d8c703e2.json
new file mode 100644
index 00000000000..a1775ad8258
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-2daaf655-9a45-4104-94f9-06b9d8c703e2.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: Update chat history icon"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-338b0a7b-81fd-460a-82f4-8e65e4a0614c.json b/packages/amazonq/.changes/next-release/Bug Fix-338b0a7b-81fd-460a-82f4-8e65e4a0614c.json
new file mode 100644
index 00000000000..b39eceeec80
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-338b0a7b-81fd-460a-82f4-8e65e4a0614c.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: chat occasionally freezes and displays gray screen"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
index a2bd239431d..5e8af394891 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -524,7 +524,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.27.0",
+        "@aws/mynah-ui": "^4.30.0",
         "@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/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
index e9354ea90a2..2539db135c0 100644
--- a/packages/core/src/amazonq/webview/ui/main.ts
+++ b/packages/core/src/amazonq/webview/ui/main.ts
@@ -970,7 +970,7 @@ export const createMynahUI = (
             tabBarButtons: [
                 {
                     id: 'history_sheet',
-                    icon: MynahIcons.COMMENT,
+                    icon: MynahIcons.HISTORY,
                     description: 'View chat history',
                 },
                 /* Temporarily hide export chat button from tab bar