diff --git a/src/platform/packages/private/kbn-esql-editor/src/editor_footer/feedback_component.tsx b/src/platform/packages/private/kbn-esql-editor/src/editor_footer/feedback_component.tsx
index 12aca01f89425..854661c3db2c7 100644
--- a/src/platform/packages/private/kbn-esql-editor/src/editor_footer/feedback_component.tsx
+++ b/src/platform/packages/private/kbn-esql-editor/src/editor_footer/feedback_component.tsx
@@ -9,7 +9,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiFlexItem, EuiIcon, useEuiTheme, EuiLink, EuiToolTip, EuiFlexGroup } from '@elastic/eui';
+import { EuiFlexItem, EuiIconTip, useEuiTheme, EuiLink, EuiButtonEmpty } from '@elastic/eui';
 import { css } from '@emotion/react';
 import { FEEDBACK_LINK } from '@kbn/esql-utils';
 
@@ -25,46 +25,38 @@ export function SubmitFeedbackComponent({ isSpaceReduced }: { isSpaceReduced?: b
             target="_blank"
             data-test-subj="ESQLEditor-feedback-link"
           >
-            <EuiToolTip
-              position="top"
+            <EuiIconTip
+              type="editorComment"
+              color="primary"
+              size="m"
+              css={css`
+                margin-right: ${euiTheme.size.s};
+              `}
               content={i18n.translate('esqlEditor.query.feedback', {
                 defaultMessage: 'Feedback',
               })}
-            >
-              <EuiIcon
-                type="editorComment"
-                color="primary"
-                size="m"
-                css={css`
-                  margin-right: ${euiTheme.size.s};
-                `}
-              />
-            </EuiToolTip>
+              position="top"
+            />
           </EuiLink>
         </EuiFlexItem>
       )}
       {!isSpaceReduced && (
-        <EuiLink
+        <EuiButtonEmpty
+          size="xs"
+          color="primary"
+          flush="both"
           href={FEEDBACK_LINK}
-          external={false}
           target="_blank"
           css={css`
-            font-size: 12px;
             margin-right: ${euiTheme.size.m};
           `}
+          iconType="editorComment"
           data-test-subj="ESQLEditor-feedback-link"
         >
-          <EuiFlexGroup gutterSize="s" alignItems="center">
-            <EuiFlexItem grow={false}>
-              <EuiIcon type="editorComment" color="primary" size="s" />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              {i18n.translate('esqlEditor.query.submitFeedback', {
-                defaultMessage: 'Submit feedback',
-              })}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiLink>
+          {i18n.translate('esqlEditor.query.submitFeedback', {
+            defaultMessage: 'Submit feedback',
+          })}
+        </EuiButtonEmpty>
       )}
     </>
   );
diff --git a/src/platform/packages/private/kbn-esql-editor/src/editor_footer/history_starred_queries.tsx b/src/platform/packages/private/kbn-esql-editor/src/editor_footer/history_starred_queries.tsx
index ecc125953cc36..1a889543a3de2 100644
--- a/src/platform/packages/private/kbn-esql-editor/src/editor_footer/history_starred_queries.tsx
+++ b/src/platform/packages/private/kbn-esql-editor/src/editor_footer/history_starred_queries.tsx
@@ -12,7 +12,6 @@ import { i18n } from '@kbn/i18n';
 import {
   EuiFlexGroup,
   EuiFlexItem,
-  EuiIcon,
   useEuiTheme,
   EuiInMemoryTable,
   EuiBasicTableColumn,
@@ -26,6 +25,9 @@ import {
   EuiTabs,
   EuiNotificationBadge,
   EuiText,
+  EuiIconTip,
+  EuiLink,
+  EuiIcon,
 } from '@elastic/eui';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { cssFavoriteHoverWithinEuiTableRow } from '@kbn/content-management-favorites-public';
@@ -53,34 +55,31 @@ export function QueryHistoryAction({
   isHistoryOpen: boolean;
   isSpaceReduced?: boolean;
 }) {
-  const { euiTheme } = useEuiTheme();
   return (
     <>
       {isSpaceReduced && (
         <EuiFlexItem grow={false} data-test-subj="ESQLEditor-toggle-query-history-icon">
-          <EuiToolTip
-            position="top"
-            content={
-              isHistoryOpen
-                ? i18n.translate('esqlEditor.query.hideQueriesLabel', {
-                    defaultMessage: 'Hide recent queries',
-                  })
-                : i18n.translate('esqlEditor.query.showQueriesLabel', {
-                    defaultMessage: 'Show recent queries',
-                  })
-            }
+          <EuiLink
+            onClick={toggleHistory}
+            external={false}
+            data-test-subj="ESQLEditor-hide-queries-link"
           >
-            <EuiIcon
+            <EuiIconTip
               type="clockCounter"
               color="primary"
               size="m"
-              onClick={toggleHistory}
-              css={css`
-                margin-right: ${euiTheme.size.s};
-                cursor: pointer;
-              `}
+              content={
+                isHistoryOpen
+                  ? i18n.translate('esqlEditor.query.hideQueriesLabel', {
+                      defaultMessage: 'Hide recent queries',
+                    })
+                  : i18n.translate('esqlEditor.query.showQueriesLabel', {
+                      defaultMessage: 'Show recent queries',
+                    })
+              }
+              position="top"
             />
-          </EuiToolTip>
+          </EuiLink>
         </EuiFlexItem>
       )}
       {!isSpaceReduced && (