diff --git a/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
index 3486b1841a1..71946f06500 100644
--- a/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
+++ b/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
@@ -361,7 +361,7 @@ export class Connector extends BaseConnector {
                 break
             case 'run-shell-command':
                 answer.header = {
-                    icon: 'code-block' as MynahIconsType,
+                    icon: 'shell' as MynahIconsType,
                     body: 'shell',
                     status: {
                         icon: 'ok' as MynahIconsType,
@@ -372,7 +372,7 @@ export class Connector extends BaseConnector {
                 break
             case 'reject-shell-command':
                 answer.header = {
-                    icon: 'code-block' as MynahIconsType,
+                    icon: 'shell' as MynahIconsType,
                     body: 'shell',
                     status: {
                         icon: 'cancel' as MynahIconsType,
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
index 1f75f33c5ed..7a0921724c7 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/controller.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -812,10 +812,7 @@ export class ChatController {
             getLogger().error(
                 `toolUse name: ${currentToolUse!.name} of toolUseWithError in the stored session doesn't match when click shell command reject button.`
             )
-            return
         }
-
-        await this.generateStaticTextResponse('reject-shell-command', triggerId)
     }
 
     private async processCustomFormAction(message: CustomFormActionMessage) {
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
index ff079e422a6..c9894b04596 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -69,12 +69,7 @@ import { AsyncEventProgressMessage } from '../../../../amazonq/commons/connector
 import { localize } from '../../../../shared/utilities/vsCodeUtils'
 import { getDiffLinesFromChanges } from '../../../../shared/utilities/diffUtils'
 
-export type StaticTextResponseType =
-    | 'quick-action-help'
-    | 'onboarding-help'
-    | 'transform'
-    | 'help'
-    | 'reject-shell-command'
+export type StaticTextResponseType = 'quick-action-help' | 'onboarding-help' | 'transform' | 'help'
 
 export type MessengerResponseType = {
     $metadata: { requestId?: string; httpStatusCode?: number }
@@ -555,7 +550,7 @@ export class Messenger {
                     },
                 ]
                 header = {
-                    icon: 'code-block' as MynahIconsType,
+                    icon: 'shell' as MynahIconsType,
                     body: 'shell',
                     buttons,
                 }
@@ -676,10 +671,6 @@ export class Messenger {
                 ]
                 followUpsHeader = 'Try Examples:'
                 break
-            case 'reject-shell-command':
-                // need to update the string later
-                message = 'The shell command execution rejected. Abort.'
-                break
         }
 
         this.dispatcher.sendChatMessage(