diff --git a/public/index.scss b/public/index.scss
index cbc51a49..54c04d13 100644
--- a/public/index.scss
+++ b/public/index.scss
@@ -120,9 +120,7 @@
 }
 
 .llm-chat-bubble-panel.llm-chat-bubble-panel-input {
-  background: #159d8d;
   margin-left: auto;
-  color: #fcfeff;
   max-width: 85%;
 }
 .llm-chat-bubble-panel.llm-chat-bubble-panel-output {
diff --git a/public/tabs/chat/chat_page_content.tsx b/public/tabs/chat/chat_page_content.tsx
index 0b85f5f7..25bd426e 100644
--- a/public/tabs/chat/chat_page_content.tsx
+++ b/public/tabs/chat/chat_page_content.tsx
@@ -151,7 +151,7 @@ export const ChatPageContent: React.FC<ChatPageContentProps> = React.memo((props
       {configSchema.chat.regenerateMessage &&
         chatState.llmResponding &&
         chatContext.conversationId && (
-          <div style={{ marginLeft: '55px', marginTop: 10 }}>
+          <div style={{ marginLeft: '8px', marginTop: 10 }}>
             <EuiFlexGroup alignItems="flexStart" direction="column" gutterSize="s">
               <EuiFlexItem>
                 <SuggestionBubble
@@ -221,7 +221,7 @@ const Suggestions: React.FC<SuggestionsProps> = (props) => {
   registry.setSuggestionsByInteractionId(interactionId, suggestedActions);
 
   return (
-    <div aria-label="chat suggestions" style={{ marginLeft: '55px', marginTop: '5px' }}>
+    <div aria-label="chat suggestions" style={{ marginLeft: '8px', marginTop: '5px' }}>
       <EuiText color="subdued" size="xs" style={{ paddingLeft: 10 }}>
         <small>Available suggestions</small>
       </EuiText>
diff --git a/public/tabs/chat/messages/message_bubble.tsx b/public/tabs/chat/messages/message_bubble.tsx
index 1118fbce..4ec576e3 100644
--- a/public/tabs/chat/messages/message_bubble.tsx
+++ b/public/tabs/chat/messages/message_bubble.tsx
@@ -4,17 +4,15 @@
  */
 
 import {
-  EuiAvatar,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiLoadingContent,
   EuiLoadingSpinner,
   EuiPanel,
   EuiSpacer,
-  EuiIcon,
+  EuiText,
 } from '@elastic/eui';
 import React from 'react';
-import { IconType } from '@elastic/eui/src/components/icon/icon';
+import { i18n } from '@osd/i18n';
 import { MessageActions } from './message_action';
 import { useCore } from '../../../contexts';
 import { getConfigSchema, getLogoIcon } from '../../../services';
@@ -53,48 +51,36 @@ export const MessageBubble: React.FC<MessageBubbleProps> = React.memo((props) =>
     props.message.type === 'output' &&
     props.message.contentType === 'markdown';
 
-  const createAvatar = (iconType?: IconType) => {
-    if (iconType) {
-      return (
-        <EuiAvatar
-          className="llm-chat-avatar"
-          name="llm"
-          size="l"
-          iconType={iconType}
-          iconColor="#fff"
-        />
-      );
-    } else {
-      return <EuiIcon type={getLogoIcon('gradient')} size="l" />;
-    }
-  };
-
   if ('loading' in props && props.loading) {
     return (
-      <EuiFlexGroup
-        aria-label="chat message loading"
-        gutterSize="m"
-        justifyContent="flexStart"
-        alignItems="flexStart"
-        responsive={false}
+      <EuiPanel
+        hasShadow={false}
+        hasBorder={false}
+        paddingSize="l"
+        color="plain"
+        className="llm-chat-bubble-panel llm-chat-bubble-panel-output llm-chat-bubble-panel-loading"
       >
-        <EuiFlexItem grow={false}>
-          {createAvatar(() => (
-            <EuiLoadingSpinner size="l" />
-          ))}
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiPanel
-            hasShadow={false}
-            hasBorder={false}
-            paddingSize="l"
-            color="plain"
-            className="llm-chat-bubble-panel llm-chat-bubble-panel-output llm-chat-bubble-panel-loading"
-          >
-            <EuiLoadingContent lines={3} />
-          </EuiPanel>
-        </EuiFlexItem>
-      </EuiFlexGroup>
+        <EuiFlexGroup
+          aria-label="chat message loading"
+          gutterSize="s"
+          justifyContent="flexStart"
+          alignItems="center"
+          responsive={false}
+        >
+          <EuiFlexItem grow={false}>
+            <EuiLoadingSpinner size="m" />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiText size="s">
+              <i>
+                {i18n.translate('chat.loading.response', {
+                  defaultMessage: 'Generating response...',
+                })}
+              </i>
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
     );
   }
 
@@ -113,7 +99,7 @@ export const MessageBubble: React.FC<MessageBubbleProps> = React.memo((props) =>
               hasShadow={false}
               hasBorder={false}
               paddingSize="l"
-              color="plain"
+              color="primary"
               className="llm-chat-bubble-panel llm-chat-bubble-panel-input"
             >
               {props.children}
@@ -126,66 +112,54 @@ export const MessageBubble: React.FC<MessageBubbleProps> = React.memo((props) =>
     const fullWidth = props.message.fullWidth;
 
     return (
-      <EuiFlexGroup
+      <EuiPanel
+        /**
+         * When using minWidth the content width inside may be larger than the container itself,
+         * especially in data grid case that the content will change its size according to fullScreen or not.
+         */
+        style={fullWidth ? { width: '100%' } : {}}
+        hasShadow={false}
+        hasBorder={false}
+        paddingSize="l"
+        color="plain"
+        className="llm-chat-bubble-panel llm-chat-bubble-panel-output"
         aria-label="chat message bubble"
-        gutterSize="m"
-        justifyContent="flexStart"
-        alignItems="flexStart"
-        responsive={false}
       >
-        <EuiFlexItem grow={false}>
-          {props.message.contentType === 'error' ? createAvatar('alert') : createAvatar()}
-        </EuiFlexItem>
-        <EuiFlexItem className="llm-chat-bubble-wrapper">
-          <EuiPanel
-            /**
-             * When using minWidth the content width inside may be larger than the container itself,
-             * especially in data grid case that the content will change its size according to fullScreen or not.
-             */
-            style={fullWidth ? { width: '100%' } : {}}
-            hasShadow={false}
-            hasBorder={false}
-            paddingSize="l"
-            color="plain"
-            className="llm-chat-bubble-panel llm-chat-bubble-panel-output"
-          >
-            {props.children}
-            {props.showActionBar && (
-              <>
-                <EuiSpacer size="xs" />
-                <MessageActions
-                  contentToCopy={props.message.content ?? ''}
-                  showRegenerate={props.showRegenerate}
-                  onRegenerate={() => props.onRegenerate?.(props.interaction?.interaction_id || '')}
-                  interaction={props.interaction}
-                  message={props.message as IOutput}
-                  showFeedback={showFeedback}
-                  showTraceIcon={configSchema.chat.trace && !!props.message.interactionId}
-                  traceTip="How was this generated?"
-                  traceInteractionId={props.message.interactionId || ''}
-                  onViewTrace={() => {
-                    const message = props.message as IOutput;
-                    const viewTraceAction: ISuggestedAction = {
-                      actionType: 'view_trace',
-                      metadata: {
-                        interactionId: message.interactionId || '',
-                      },
-                      message: 'How was this generated?',
-                    };
-                    executeAction(viewTraceAction, message);
-                  }}
-                  shouldActionBarVisibleOnHover={props.shouldActionBarVisibleOnHover}
-                  isFullWidth={fullWidth}
-                  httpSetup={core.services.http}
-                  dataSourceService={core.services.dataSource}
-                  usageCollection={core.services.setupDeps.usageCollection}
-                  metricAppName="chat"
-                />
-              </>
-            )}
-          </EuiPanel>
-        </EuiFlexItem>
-      </EuiFlexGroup>
+        {props.children}
+        {props.showActionBar && (
+          <>
+            <EuiSpacer size="xs" />
+            <MessageActions
+              contentToCopy={props.message.content ?? ''}
+              showRegenerate={props.showRegenerate}
+              onRegenerate={() => props.onRegenerate?.(props.interaction?.interaction_id || '')}
+              interaction={props.interaction}
+              message={props.message as IOutput}
+              showFeedback={showFeedback}
+              showTraceIcon={configSchema.chat.trace && !!props.message.interactionId}
+              traceTip="How was this generated?"
+              traceInteractionId={props.message.interactionId || ''}
+              onViewTrace={() => {
+                const message = props.message as IOutput;
+                const viewTraceAction: ISuggestedAction = {
+                  actionType: 'view_trace',
+                  metadata: {
+                    interactionId: message.interactionId || '',
+                  },
+                  message: 'How was this generated?',
+                };
+                executeAction(viewTraceAction, message);
+              }}
+              shouldActionBarVisibleOnHover={props.shouldActionBarVisibleOnHover}
+              isFullWidth={fullWidth}
+              httpSetup={core.services.http}
+              dataSourceService={core.services.dataSource}
+              usageCollection={core.services.setupDeps.usageCollection}
+              metricAppName="chat"
+            />
+          </>
+        )}
+      </EuiPanel>
     );
   }
   return null;