diff --git a/packages/module/src/MessageBar/AttachButton.tsx b/packages/module/src/MessageBar/AttachButton.tsx
index f012cce67..dee009da8 100644
--- a/packages/module/src/MessageBar/AttachButton.tsx
+++ b/packages/module/src/MessageBar/AttachButton.tsx
@@ -6,7 +6,7 @@ import type { Ref, FunctionComponent } from 'react';
 import { forwardRef } from 'react';
 
 // Import PatternFly components
-import { Button, ButtonProps, Icon, Tooltip, TooltipProps } from '@patternfly/react-core';
+import { Button, ButtonProps, Tooltip, TooltipProps } from '@patternfly/react-core';
 import { Accept, DropEvent, DropzoneOptions, FileError, FileRejection, useDropzone } from 'react-dropzone';
 import { PaperclipIcon } from '@patternfly/react-icons/dist/esm/icons/paperclip-icon';
 
@@ -110,18 +110,16 @@ const AttachButtonBase: FunctionComponent<AttachButtonProps> = ({
         <Button
           variant="plain"
           ref={innerRef}
-          className={`pf-chatbot__button--attach ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
+          isCircle
+          className={`pf-chatbot__message-bar-button pf-chatbot__button--attach ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
           aria-label={props['aria-label'] || 'Attach'}
           isDisabled={isDisabled}
           onClick={onClick ?? open}
-          icon={
-            <Icon iconSize={isCompact ? 'lg' : 'xl'} isInline>
-              {icon}
-            </Icon>
-          }
-          size={isCompact ? 'sm' : undefined}
+          size={isCompact ? 'sm' : 'lg'}
           {...props}
-        />
+        >
+          {icon}
+        </Button>
       </Tooltip>
     </>
   );
diff --git a/packages/module/src/MessageBar/AttachButton.scss b/packages/module/src/MessageBar/Button.scss
similarity index 50%
rename from packages/module/src/MessageBar/AttachButton.scss
rename to packages/module/src/MessageBar/Button.scss
index 6f270b50f..fddbc8ca8 100644
--- a/packages/module/src/MessageBar/AttachButton.scss
+++ b/packages/module/src/MessageBar/Button.scss
@@ -1,36 +1,30 @@
 // ============================================================================
-// Chatbot Footer - Message Bar - Attach
+// Chatbot Footer - Message Bar - Shared button styles
 // ============================================================================
-.pf-v6-c-button.pf-chatbot__button--attach {
-  border-radius: var(--pf-t--global--border--radius--pill);
-  padding: var(--pf-t--global--spacer--md);
-  width: 3rem;
-  height: 3rem;
+.pf-v6-c-button.pf-chatbot__message-bar-button {
+  color: var(--pf-t--global--icon--color--subtle);
 
+  .pf-v6-c-button__text,
   .pf-v6-c-button__icon {
-    color: var(--pf-t--global--icon--color--subtle);
+    svg {
+      font-size: var(--pf-t--global--icon--size--xl);
+      vertical-align: middle;
+    }
   }
 
   // Interactive states
   &:hover {
-    .pf-v6-c-button__icon {
-      color: var(--pf-t--global--icon--color--regular);
-    }
+    color: var(--pf-t--global--icon--color--regular);
   }
 
   &:active,
   &:focus {
     background-color: var(--pf-t--global--color--brand--clicked);
-
-    .pf-v6-c-button__icon {
-      color: var(--pf-t--global--icon--color--inverse);
-    }
+    color: var(--pf-t--global--icon--color--inverse);
 
     &:hover,
     &:focus {
-      .pf-v6-c-button__icon {
-        color: var(--pf-t--global--icon--color--inverse);
-      }
+      color: var(--pf-t--global--icon--color--inverse);
     }
   }
 }
@@ -38,8 +32,9 @@
 // ============================================================================
 // Information density styles
 // ============================================================================
-.pf-v6-c-button.pf-chatbot__button--attach.pf-m-compact {
-  width: 1.5rem;
-  height: 1.5rem;
-  align-items: center;
+.pf-v6-c-button.pf-chatbot__message-bar-button.pf-m-compact {
+  .pf-v6-c-button__text svg,
+  .pf-v6-c-button__icon svg {
+    font-size: var(--pf-t--global--icon--size--lg);
+  }
 }
diff --git a/packages/module/src/MessageBar/MessageBar.scss b/packages/module/src/MessageBar/MessageBar.scss
index f8cc81752..10839d555 100644
--- a/packages/module/src/MessageBar/MessageBar.scss
+++ b/packages/module/src/MessageBar/MessageBar.scss
@@ -1,5 +1,5 @@
 // Import related component scss files.
-@import './AttachButton';
+@import './Button';
 @import './MicrophoneButton';
 @import './SendButton';
 @import './StopButton';
@@ -60,6 +60,7 @@
 
   &-actions {
     display: flex;
+    flex-shrink: 0;
     justify-content: end;
     padding-block-start: var(--pf-t--global--spacer--xs);
     padding-block-end: var(--pf-t--global--spacer--xs);
@@ -73,6 +74,7 @@
 
   &-actions-group {
     display: flex;
+    flex-shrink: 0;
     padding-block-start: var(--pf-t--global--spacer--xs);
     padding-block-end: var(--pf-t--global--spacer--xs);
     gap: var(--pf-t--global--spacer--gap--action-to-action--plain);
diff --git a/packages/module/src/MessageBar/MicrophoneButton.scss b/packages/module/src/MessageBar/MicrophoneButton.scss
index 9ca152d21..ff4fb0b5d 100644
--- a/packages/module/src/MessageBar/MicrophoneButton.scss
+++ b/packages/module/src/MessageBar/MicrophoneButton.scss
@@ -1,24 +1,7 @@
 // ============================================================================
 // Chatbot Footer - Message Bar - Microphone
 // ============================================================================
-.pf-v6-c-button.pf-chatbot__button--microphone {
-  border-radius: var(--pf-t--global--border--radius--pill);
-  padding: var(--pf-t--global--spacer--md);
-  width: 3rem;
-  height: 3rem;
-
-  .pf-v6-c-button__icon {
-    color: var(--pf-t--global--icon--color--subtle);
-  }
-
-  // Interactive states
-  &:hover,
-  &:focus {
-    .pf-v6-c-button__icon {
-      color: var(--pf-t--global--icon--color--regular);
-    }
-  }
-
+.pf-v6-c-button.pf-chatbot__message-bar-button.pf-chatbot__button--microphone {
   // Active state (while recording voice)
   &--active {
     background-color: var(--pf-t--global--color--brand--clicked);
@@ -45,13 +28,4 @@
   100% {
     box-shadow: 0 0 0 16px rgba(0, 102, 204, 0);
   }
-}
-
-// ============================================================================
-// Information density styles
-// ============================================================================
-.pf-v6-c-button.pf-chatbot__button--microphone.pf-m-compact {
-  width: 1.5rem;
-  height: 1.5rem;
-  align-items: center;
-}
+}
\ No newline at end of file
diff --git a/packages/module/src/MessageBar/MicrophoneButton.tsx b/packages/module/src/MessageBar/MicrophoneButton.tsx
index f34ceae8c..f16a094fc 100644
--- a/packages/module/src/MessageBar/MicrophoneButton.tsx
+++ b/packages/module/src/MessageBar/MicrophoneButton.tsx
@@ -6,7 +6,7 @@ import type { FunctionComponent } from 'react';
 import { useState, useCallback, useEffect } from 'react';
 
 // Import PatternFly components
-import { Button, ButtonProps, Tooltip, TooltipProps, Icon } from '@patternfly/react-core';
+import { Button, ButtonProps, Tooltip, TooltipProps } from '@patternfly/react-core';
 
 // Import FontAwesome icons
 import { MicrophoneIcon } from '@patternfly/react-icons/dist/esm/icons/microphone-icon';
@@ -106,18 +106,16 @@ export const MicrophoneButton: FunctionComponent<MicrophoneButtonProps> = ({
     >
       <Button
         variant="plain"
-        className={`pf-chatbot__button--microphone ${isListening ? 'pf-chatbot__button--microphone--active' : ''} ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
+        className={`pf-chatbot__message-bar-button pf-chatbot__button--microphone ${isListening ? 'pf-chatbot__button--microphone--active' : ''} ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
+        isCircle
         aria-label={props['aria-label'] || (isListening ? 'Stop listening' : 'Use microphone')}
         aria-pressed={isListening}
         onClick={isListening ? stopListening : startListening}
-        icon={
-          <Icon iconSize={isCompact ? 'lg' : 'xl'} isInline>
-            <MicrophoneIcon />
-          </Icon>
-        }
-        size={isCompact ? 'sm' : undefined}
+        size={isCompact ? 'sm' : 'lg'}
         {...props}
-      />
+      >
+        <MicrophoneIcon />
+      </Button>
     </Tooltip>
   );
 };
diff --git a/packages/module/src/MessageBar/SendButton.scss b/packages/module/src/MessageBar/SendButton.scss
index 42732e5d3..c55536980 100644
--- a/packages/module/src/MessageBar/SendButton.scss
+++ b/packages/module/src/MessageBar/SendButton.scss
@@ -1,24 +1,13 @@
 // ============================================================================
 // Chatbot Footer - Message Bar - Send
 // ============================================================================
-.pf-v6-c-button.pf-chatbot__button--send {
-  border-radius: var(--pf-t--global--border--radius--pill);
-  padding: var(--pf-t--global--spacer--md);
-  width: 3rem;
-  height: 3rem;
-
-  .pf-v6-c-button__icon {
-    --pf-v6-c-button__icon--Color: var(--pf-t--global--color--brand--default);
-  }
-
+.pf-v6-c-button.pf-chatbot__message-bar-button.pf-chatbot__button--send {
+  color: var(--pf-t--global--color--brand--default);
+  
   &:hover,
   &:focus {
     background-color: rgba(146, 197, 249, 0.25); // --pf-t--global--color--nonstatus--blue--default @ 25%;
     color: var(--pf-t--global--color--brand--hover);
-
-    .pf-v6-c-button__icon {
-      color: var(--pf-t--global--color--brand--hover);
-    }
   }
 }
 
@@ -51,12 +40,3 @@
     transform: translate3d(0, 0, 0);
   }
 }
-
-// ============================================================================
-// Information density styles
-// ============================================================================
-.pf-v6-c-button.pf-chatbot__button--send.pf-m-compact {
-  width: 1.5rem;
-  height: 1.5rem;
-  align-items: center;
-}
diff --git a/packages/module/src/MessageBar/SendButton.tsx b/packages/module/src/MessageBar/SendButton.tsx
index a9acc8c0b..21d6f5b3c 100644
--- a/packages/module/src/MessageBar/SendButton.tsx
+++ b/packages/module/src/MessageBar/SendButton.tsx
@@ -4,7 +4,7 @@
 import type { FunctionComponent } from 'react';
 
 // Import PatternFly components
-import { Button, ButtonProps, Tooltip, TooltipProps, Icon } from '@patternfly/react-core';
+import { Button, ButtonProps, Tooltip, TooltipProps } from '@patternfly/react-core';
 
 import { PaperPlaneIcon } from '@patternfly/react-icons/dist/esm/icons/paper-plane-icon';
 
@@ -43,17 +43,15 @@ export const SendButton: FunctionComponent<SendButtonProps> = ({
   >
     <Button
       variant="plain"
-      className={`pf-chatbot__button--send ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
+      isCircle
+      className={`pf-chatbot__message-bar-button pf-chatbot__button--send ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
       aria-label={props['aria-label'] || 'Send'}
       onClick={onClick}
-      icon={
-        <Icon iconSize={isCompact ? 'lg' : 'xl'} isInline>
-          <PaperPlaneIcon />
-        </Icon>
-      }
-      size={isCompact ? 'sm' : undefined}
+      size={isCompact ? 'sm' : 'lg'}
       {...props}
-    />
+    >
+      <PaperPlaneIcon />
+    </Button>
   </Tooltip>
 );
 
diff --git a/packages/module/src/MessageBar/StopButton.scss b/packages/module/src/MessageBar/StopButton.scss
index 939a39f4c..8ac511892 100644
--- a/packages/module/src/MessageBar/StopButton.scss
+++ b/packages/module/src/MessageBar/StopButton.scss
@@ -1,19 +1,9 @@
 // ============================================================================
 // Chatbot Footer - Message Bar - Stop
 // ============================================================================
-.pf-v6-c-button.pf-chatbot__button--stop {
+.pf-v6-c-button.pf-chatbot__message-bar-button.pf-chatbot__button--stop {
   background-color: var(--pf-t--global--color--brand--default);
-  border-radius: var(--pf-t--global--border--radius--pill);
-  padding: var(--pf-t--global--spacer--md);
-  width: 3rem;
-  height: 3rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  .pf-v6-c-button__icon {
-    color: var(--pf-t--global--icon--color--on-brand--default);
-  }
+  color: var(--pf-t--global--icon--color--on-brand--default);
 
   &:hover {
     background-color: var(--pf-t--global--color--brand--hover);
@@ -21,25 +11,11 @@
 
   &:focus {
     background-color: var(--pf-t--global--color--brand--clicked);
-
-    .pf-v6-c-button__icon {
-      color: var(--pf-t--global--icon--color--on-brand--default);
-    }
+    color: var(--pf-t--global--icon--color--on-brand--default);
 
     &:hover,
     &:focus {
-      .pf-v6-c-button__icon {
-        color: var(--pf-t--global--icon--color--on-brand--default);
-      }
+      color: var(--pf-t--global--icon--color--on-brand--default);
     }
   }
 }
-
-// ============================================================================
-// Information density styles
-// ============================================================================
-.pf-v6-c-button.pf-chatbot__button--stop.pf-m-compact {
-  width: 1.5rem;
-  height: 1.5rem;
-  align-items: center;
-}
diff --git a/packages/module/src/MessageBar/StopButton.tsx b/packages/module/src/MessageBar/StopButton.tsx
index 2939c65e8..b7485326c 100644
--- a/packages/module/src/MessageBar/StopButton.tsx
+++ b/packages/module/src/MessageBar/StopButton.tsx
@@ -4,7 +4,7 @@
 import type { FunctionComponent } from 'react';
 
 // Import PatternFly components
-import { Button, ButtonProps, Tooltip, TooltipProps, Icon } from '@patternfly/react-core';
+import { Button, ButtonProps, Tooltip, TooltipProps } from '@patternfly/react-core';
 
 export interface StopButtonProps extends ButtonProps {
   /** Callback for when button is clicked */
@@ -40,23 +40,21 @@ export const StopButton: FunctionComponent<StopButtonProps> = ({
     {...tooltipProps}
   >
     <Button
-      className={`pf-chatbot__button--stop ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
+      className={`pf-chatbot__message-bar-button pf-chatbot__button--stop ${isCompact ? 'pf-m-compact' : ''} ${className ?? ''}`}
       variant="link"
+      isCircle
       aria-label={props['aria-label'] || 'Stop'}
       onClick={onClick}
-      icon={
-        <Icon iconSize={isCompact ? 'lg' : 'xl'} isInline>
-          <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path
-              d="M0.5 3C0.5 1.62109 1.62109 0.5 3 0.5H13C14.3789 0.5 15.5 1.62109 15.5 3V13C15.5 14.3789 14.3789 15.5 13 15.5H3C1.62109 15.5 0.5 14.3789 0.5 13V3Z"
-              fill="currentColor"
-            />
-          </svg>
-        </Icon>
-      }
-      size={isCompact ? 'sm' : undefined}
+      size={isCompact ? 'sm' : 'lg'}
       {...props}
-    />
+    >
+      <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path
+          d="M0.5 3C0.5 1.62109 1.62109 0.5 3 0.5H13C14.3789 0.5 15.5 1.62109 15.5 3V13C15.5 14.3789 14.3789 15.5 13 15.5H3C1.62109 15.5 0.5 14.3789 0.5 13V3Z"
+          fill="currentColor"
+        />
+      </svg>
+    </Button>
   </Tooltip>
 );
 
diff --git a/packages/module/src/MessageBox/JumpButton.scss b/packages/module/src/MessageBox/JumpButton.scss
index 23cfdf377..a58b3a95b 100644
--- a/packages/module/src/MessageBox/JumpButton.scss
+++ b/packages/module/src/MessageBox/JumpButton.scss
@@ -11,7 +11,6 @@
   align-items: center !important;
   justify-content: center !important;
   padding: var(--pf-t--global--spacer--md) !important;
-  border-radius: var(--pf-t--global--border--radius--pill) !important;
   --pf-v6-c-button--MinWidth: 2rem !important;
   background-color: var(--pf-t--global--background--color--floating--default);
   border: 1px solid var(--pf-t--global--border--color--default) !important;
@@ -25,6 +24,14 @@
     opacity var(--pf-t--global--motion--timing-function--accelerate) var(--pf-t--global--motion--duration--md) !important;
   z-index: var(--pf-t--global--z-index--md) !important;
 
+  .pf-v6-c-button__text,
+  .pf-v6-c-button__icon {
+    svg {
+      font-size: var(--pf-t--global--icon--size--lg);
+      vertical-align: middle;
+    }
+  }
+
   .pf-v6-c-button__text {
     line-height: 1rem;
   }
diff --git a/packages/module/src/MessageBox/JumpButton.tsx b/packages/module/src/MessageBox/JumpButton.tsx
index c4f6e4875..d081e2b86 100644
--- a/packages/module/src/MessageBox/JumpButton.tsx
+++ b/packages/module/src/MessageBox/JumpButton.tsx
@@ -4,7 +4,7 @@
 import type { FunctionComponent } from 'react';
 
 // Import PatternFly components
-import { Button, Tooltip, Icon, TooltipProps, ButtonProps } from '@patternfly/react-core';
+import { Button, Tooltip, TooltipProps, ButtonProps } from '@patternfly/react-core';
 
 import { ArrowUpIcon } from '@patternfly/react-icons/dist/esm/icons/arrow-up-icon';
 import { ArrowDownIcon } from '@patternfly/react-icons/dist/esm/icons/arrow-down-icon';
@@ -39,13 +39,12 @@ const JumpButton: FunctionComponent<JumpButtonProps> = ({
       <Button
         variant="plain"
         className={`pf-chatbot__jump pf-chatbot__jump--${position}`}
+        isCircle
         aria-label={`Back to ${position}`}
         onClick={onClick}
         {...jumpButtonProps}
       >
-        <Icon iconSize="lg" isInline>
-          {position === 'top' ? <ArrowUpIcon /> : <ArrowDownIcon />}
-        </Icon>
+        {position === 'top' ? <ArrowUpIcon /> : <ArrowDownIcon />}
       </Button>
     </Tooltip>
   );