From da693295e96060b6a38254857b67a6d683463aec Mon Sep 17 00:00:00 2001
From: Weronika Olejniczak <weronika.olejniczak@elastic.co>
Date: Wed, 27 May 2026 16:15:05 +0200
Subject: [PATCH 1/2] feat(kibana-security): replace title props and wrap
 EuiButtonIcon with EuiToolTip

---
 .../rule_editor_panel/field_rule_editor.tsx   | 57 +++++++++++++------
 .../privileges/es/index_privilege_form.tsx    | 28 +++++++--
 .../es/remote_cluster_privileges_form.tsx     | 23 +++++---
 .../privilege_summary_table.tsx               | 24 +++++---
 .../privilege_space_table.tsx                 | 53 ++++++++++++-----
 .../components/space_result_details.tsx       |  5 +-
 .../solution_view_switch_callout_internal.tsx | 34 ++++++-----
 .../space_selector/components/space_card.tsx  | 10 ++--
 8 files changed, 160 insertions(+), 74 deletions(-)

diff --git a/x-pack/platform/plugins/shared/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.tsx b/x-pack/platform/plugins/shared/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.tsx
index 912c32aa34c50..c61c04080d802 100644
--- a/x-pack/platform/plugins/shared/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.tsx
+++ b/x-pack/platform/plugins/shared/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/field_rule_editor.tsx
@@ -16,6 +16,7 @@ import {
   EuiFormRow,
   EuiIcon,
   EuiSelect,
+  EuiToolTip,
 } from '@elastic/eui';
 import type { ChangeEvent } from 'react';
 import React, { Component } from 'react';
@@ -156,21 +157,31 @@ export class FieldRuleEditor extends Component<Props, {}> {
       <EuiFlexItem grow={false}>
         <EuiFormRow hasEmptyLabelSpace={true}>
           {this.props.readOnly === false && renderAddValueButton ? (
-            <EuiButtonIcon
-              iconSize="s"
-              iconType="plusCircle"
-              onClick={this.onAddAlternateValue}
-              color="primary"
-              data-test-subj="addAlternateValueButton"
-              aria-label={i18n.translate(
+            <EuiToolTip
+              content={i18n.translate(
                 'xpack.security.management.editRoleMapping.fieldRuleEditor.addAlternateValueButton',
                 {
                   defaultMessage: 'Add alternate value',
                 }
               )}
-            />
+              disableScreenReaderOutput
+            >
+              <EuiButtonIcon
+                iconSize="s"
+                iconType="plusCircle"
+                onClick={this.onAddAlternateValue}
+                color="primary"
+                data-test-subj="addAlternateValueButton"
+                aria-label={i18n.translate(
+                  'xpack.security.management.editRoleMapping.fieldRuleEditor.addAlternateValueButton',
+                  {
+                    defaultMessage: 'Add alternate value',
+                  }
+                )}
+              />
+            </EuiToolTip>
           ) : (
-            <EuiIcon size="s" type="empty" />
+            <EuiIcon size="s" type="empty" aria-hidden={true} />
           )}
         </EuiFormRow>
       </EuiFlexItem>
@@ -182,21 +193,31 @@ export class FieldRuleEditor extends Component<Props, {}> {
       <EuiFlexItem grow={1}>
         <EuiFormRow hasEmptyLabelSpace={true}>
           {this.props.readOnly === false ? (
-            <EuiButtonIcon
-              iconType="trash"
-              color="danger"
-              iconSize="s"
-              data-test-subj={`fieldRuleEditorDeleteValue fieldRuleEditorDeleteValue-${valueIndex}`}
-              aria-label={i18n.translate(
+            <EuiToolTip
+              content={i18n.translate(
                 'xpack.security.management.editRoleMapping.fieldRuleEditor.deleteValueLabel',
                 {
                   defaultMessage: 'Delete value',
                 }
               )}
-              onClick={() => this.onRemoveAlternateValue(valueIndex)}
-            />
+              disableScreenReaderOutput
+            >
+              <EuiButtonIcon
+                iconType="trash"
+                color="danger"
+                iconSize="s"
+                data-test-subj={`fieldRuleEditorDeleteValue fieldRuleEditorDeleteValue-${valueIndex}`}
+                aria-label={i18n.translate(
+                  'xpack.security.management.editRoleMapping.fieldRuleEditor.deleteValueLabel',
+                  {
+                    defaultMessage: 'Delete value',
+                  }
+                )}
+                onClick={() => this.onRemoveAlternateValue(valueIndex)}
+              />
+            </EuiToolTip>
           ) : (
-            <EuiIcon size="s" type="empty" />
+            <EuiIcon size="s" type="empty" aria-hidden={true} />
           )}
         </EuiFormRow>
       </EuiFlexItem>
diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
index 0fffca780b976..2331578c2afe9 100644
--- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
+++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
@@ -16,6 +16,7 @@ import {
   EuiPanel,
   EuiSpacer,
   EuiSwitch,
+  EuiToolTip,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
 import _ from 'lodash';
@@ -104,8 +105,8 @@ export class IndexPrivilegeForm extends Component<Props, State> {
           </EuiFlexItem>
           {!this.props.isRoleReadOnly && (
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                aria-label={
+              <EuiToolTip
+                content={
                   this.props.indexType === 'remote_indices'
                     ? i18n.translate(
                         'xpack.security.management.editRole.indexPrivilegeForm.deleteRemoteIndexPrivilegeAriaLabel',
@@ -116,10 +117,25 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                         { defaultMessage: 'Delete index privilege' }
                       )
                 }
-                color={'danger'}
-                onClick={this.props.onDelete}
-                iconType={'trash'}
-              />
+                disableScreenReaderOutput
+              >
+                <EuiButtonIcon
+                  aria-label={
+                    this.props.indexType === 'remote_indices'
+                      ? i18n.translate(
+                          'xpack.security.management.editRole.indexPrivilegeForm.deleteRemoteIndexPrivilegeAriaLabel',
+                          { defaultMessage: 'Delete remote index privilege' }
+                        )
+                      : i18n.translate(
+                          'xpack.security.management.editRole.indexPrivilegeForm.deleteIndexPrivilegeAriaLabel',
+                          { defaultMessage: 'Delete index privilege' }
+                        )
+                  }
+                  color={'danger'}
+                  onClick={this.props.onDelete}
+                  iconType={'trash'}
+                />
+              </EuiToolTip>
             </EuiFlexItem>
           )}
         </EuiFlexGroup>
diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/remote_cluster_privileges_form.tsx b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/remote_cluster_privileges_form.tsx
index bc8b70bd7d054..bba49ac60ad93 100644
--- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/remote_cluster_privileges_form.tsx
+++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/remote_cluster_privileges_form.tsx
@@ -15,6 +15,7 @@ import {
   EuiFormRow,
   EuiPanel,
   EuiSpacer,
+  EuiToolTip,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
 import React, { Fragment, useCallback } from 'react';
@@ -165,16 +166,24 @@ export const RemoteClusterPrivilegesForm: React.FunctionComponent<Props> = ({
         </EuiFlexItem>
         {!isRoleReadOnly && (
           <EuiFlexItem grow={false}>
-            <EuiButtonIcon
-              aria-label={i18n.translate(
+            <EuiToolTip
+              content={i18n.translate(
                 'xpack.security.management.editRole.remoteClusterPrivilegeForm.deleteRemoteClusterPrivilegeAriaLabel',
                 { defaultMessage: 'Delete remote cluster privilege' }
               )}
-              color="danger"
-              onClick={onDelete}
-              iconType="trash"
-              data-test-subj={`deleteRemoteClusterPrivilegesButton${formIndex}`}
-            />
+              disableScreenReaderOutput
+            >
+              <EuiButtonIcon
+                aria-label={i18n.translate(
+                  'xpack.security.management.editRole.remoteClusterPrivilegeForm.deleteRemoteClusterPrivilegeAriaLabel',
+                  { defaultMessage: 'Delete remote cluster privilege' }
+                )}
+                color="danger"
+                onClick={onDelete}
+                iconType="trash"
+                data-test-subj={`deleteRemoteClusterPrivilegesButton${formIndex}`}
+              />
+            </EuiToolTip>
           </EuiFlexItem>
         )}
       </EuiFlexGroup>
diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
index 508b3309145f7..4622ddb37b041 100644
--- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
+++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
@@ -16,6 +16,7 @@ import {
   EuiInMemoryTable,
   EuiSpacer,
   EuiTitle,
+  EuiToolTip,
 } from '@elastic/eui';
 import React, { Fragment, useMemo, useState } from 'react';
 
@@ -126,12 +127,19 @@ export const PrivilegeSummaryTable = (props: PrivilegeSummaryTableProps) => {
         return null;
       }
       return (
-        <EuiButtonIcon
-          onClick={() => toggleExpandedFeature(featureId)}
-          data-test-subj={`expandPrivilegeSummaryRow`}
-          aria-label={expandedFeatures.includes(featureId) ? 'Collapse' : 'Expand'}
-          iconType={expandedFeatures.includes(featureId) ? 'chevronSingleUp' : 'chevronSingleDown'}
-        />
+        <EuiToolTip
+          content={expandedFeatures.includes(featureId) ? 'Collapse' : 'Expand'}
+          disableScreenReaderOutput
+        >
+          <EuiButtonIcon
+            onClick={() => toggleExpandedFeature(featureId)}
+            data-test-subj={`expandPrivilegeSummaryRow`}
+            aria-label={expandedFeatures.includes(featureId) ? 'Collapse' : 'Expand'}
+            iconType={
+              expandedFeatures.includes(featureId) ? 'chevronSingleUp' : 'chevronSingleDown'
+            }
+          />
+        </EuiToolTip>
       );
     },
   };
@@ -180,7 +188,7 @@ export const PrivilegeSummaryTable = (props: PrivilegeSummaryTableProps) => {
             />
           );
         } else {
-          iconTip = <EuiIcon size="s" type="empty" />;
+          iconTip = <EuiIcon size="s" type="empty" aria-hidden={true} />;
         }
         return (
           <span
@@ -229,7 +237,7 @@ export const PrivilegeSummaryTable = (props: PrivilegeSummaryTableProps) => {
       >
         {category.euiIconType ? (
           <EuiFlexItem grow={false}>
-            <EuiIcon size="m" type={category.euiIconType} />
+            <EuiIcon size="m" type={category.euiIconType} aria-hidden={true} />
           </EuiFlexItem>
         ) : null}
         <EuiFlexItem grow={1}>
diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index 197d243a37fd9..ebf3a98a576a0 100644
--- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -17,6 +17,7 @@ import {
   EuiIcon,
   EuiIconTip,
   EuiInMemoryTable,
+  EuiToolTip,
 } from '@elastic/eui';
 import React, { Component } from 'react';
 
@@ -187,7 +188,7 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
             ? '*'
             : basePrivilege;
 
-          let icon = <EuiIcon type="empty" size="s" />;
+          let icon = <EuiIcon type="empty" size="s" aria-hidden={true} />;
           if (privilegeCalculator.hasSupersededInheritedPrivileges(record.privilegeIndex)) {
             icon = (
               <span data-test-subj="spaceTablePrivilegeSupersededWarning">
@@ -224,38 +225,60 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
           {
             render: (record: TableRow) => {
               return (
-                <EuiButtonIcon
-                  aria-label={i18n.translate(
+                <EuiToolTip
+                  content={i18n.translate(
                     'xpack.security.management.editRole.spacePrivilegeTable.editPrivilegesLabel',
                     {
                       defaultMessage: `Edit privileges for the following spaces: {spaceNames}.`,
                       values: { spaceNames: record.spaces.map((s) => s.name).join(', ') },
                     }
                   )}
-                  color={'primary'}
-                  iconType={'pencil'}
-                  onClick={() => this.props.onEdit(record.privilegeIndex)}
-                  data-test-subj={`privilegeEditAction-${record.privilegeIndex}`}
-                />
+                  disableScreenReaderOutput
+                >
+                  <EuiButtonIcon
+                    aria-label={i18n.translate(
+                      'xpack.security.management.editRole.spacePrivilegeTable.editPrivilegesLabel',
+                      {
+                        defaultMessage: `Edit privileges for the following spaces: {spaceNames}.`,
+                        values: { spaceNames: record.spaces.map((s) => s.name).join(', ') },
+                      }
+                    )}
+                    color={'primary'}
+                    iconType={'pencil'}
+                    onClick={() => this.props.onEdit(record.privilegeIndex)}
+                    data-test-subj={`privilegeEditAction-${record.privilegeIndex}`}
+                  />
+                </EuiToolTip>
               );
             },
           },
           {
             render: (record: TableRow) => {
               return (
-                <EuiButtonIcon
-                  aria-label={i18n.translate(
+                <EuiToolTip
+                  content={i18n.translate(
                     'xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel',
                     {
                       defaultMessage: `Delete privileges for the following spaces: {spaceNames}.`,
                       values: { spaceNames: record.spaces.map((s) => s.name).join(', ') },
                     }
                   )}
-                  color={'danger'}
-                  iconType={'trash'}
-                  onClick={() => this.onDeleteSpacePrivilege(record)}
-                  data-test-subj={`privilegeDeleteAction-${record.privilegeIndex}`}
-                />
+                  disableScreenReaderOutput
+                >
+                  <EuiButtonIcon
+                    aria-label={i18n.translate(
+                      'xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel',
+                      {
+                        defaultMessage: `Delete privileges for the following spaces: {spaceNames}.`,
+                        values: { spaceNames: record.spaces.map((s) => s.name).join(', ') },
+                      }
+                    )}
+                    color={'danger'}
+                    iconType={'trash'}
+                    onClick={() => this.onDeleteSpacePrivilege(record)}
+                    data-test-subj={`privilegeDeleteAction-${record.privilegeIndex}`}
+                  />
+                </EuiToolTip>
               );
             },
           },
diff --git a/x-pack/platform/plugins/shared/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx b/x-pack/platform/plugins/shared/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
index 48768ed78194f..927fd66f11506 100644
--- a/x-pack/platform/plugins/shared/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
+++ b/x-pack/platform/plugins/shared/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
@@ -13,6 +13,7 @@ import {
   EuiSuperSelect,
   EuiSwitch,
   EuiText,
+  EuiTextTruncate,
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
@@ -172,9 +173,7 @@ export const SpaceCopyResultDetails = (props: Props) => {
                 `}
               >
                 <EuiText size="s">
-                  <p className="eui-textTruncate" title={name}>
-                    {name}
-                  </p>
+                  <EuiTextTruncate text={name} />
                 </EuiText>
               </EuiFlexItem>
               {switchProps.show && (
diff --git a/x-pack/platform/plugins/shared/spaces/public/solution_view_switch/components/solution_view_switch_callout_internal.tsx b/x-pack/platform/plugins/shared/spaces/public/solution_view_switch/components/solution_view_switch_callout_internal.tsx
index d7f80f7bb8bd9..5b42cf51ff5fd 100644
--- a/x-pack/platform/plugins/shared/spaces/public/solution_view_switch/components/solution_view_switch_callout_internal.tsx
+++ b/x-pack/platform/plugins/shared/spaces/public/solution_view_switch/components/solution_view_switch_callout_internal.tsx
@@ -13,6 +13,7 @@ import {
   EuiHorizontalRule,
   EuiSpacer,
   EuiText,
+  EuiToolTip,
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
@@ -77,19 +78,26 @@ export const SolutionViewSwitchCalloutInternal = ({
               </EuiText>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                data-test-subj="solutionViewSwitchCalloutDismissButton"
-                iconType="cross"
-                size="xs"
-                color="text"
-                aria-label={i18n.translate(
-                  'xpack.spaces.solutionViewSwitch.callout.dismissButton',
-                  {
-                    defaultMessage: 'Dismiss',
-                  }
-                )}
-                onClick={onDismiss}
-              />
+              <EuiToolTip
+                content={i18n.translate('xpack.spaces.solutionViewSwitch.callout.dismissButton', {
+                  defaultMessage: 'Dismiss',
+                })}
+                disableScreenReaderOutput
+              >
+                <EuiButtonIcon
+                  data-test-subj="solutionViewSwitchCalloutDismissButton"
+                  iconType="cross"
+                  size="xs"
+                  color="text"
+                  aria-label={i18n.translate(
+                    'xpack.spaces.solutionViewSwitch.callout.dismissButton',
+                    {
+                      defaultMessage: 'Dismiss',
+                    }
+                  )}
+                  onClick={onDismiss}
+                />
+              </EuiToolTip>
             </EuiFlexItem>
           </EuiFlexGroup>
           <EuiSpacer size="s" />
diff --git a/x-pack/platform/plugins/shared/spaces/public/space_selector/components/space_card.tsx b/x-pack/platform/plugins/shared/spaces/public/space_selector/components/space_card.tsx
index 8468a2d47c43e..52366b4a40fc6 100644
--- a/x-pack/platform/plugins/shared/spaces/public/space_selector/components/space_card.tsx
+++ b/x-pack/platform/plugins/shared/spaces/public/space_selector/components/space_card.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiCard, EuiLoadingSpinner, EuiTextColor, useEuiTheme } from '@elastic/eui';
+import { EuiCard, EuiLoadingSpinner, EuiTextColor, EuiToolTip, useEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
 import React, { lazy, Suspense } from 'react';
 
@@ -65,9 +65,11 @@ function renderSpaceDescription(space: Space) {
   }
 
   return (
-    <EuiTextColor color="subdued" title={description} className="eui-textBreakWord">
-      {description}
-    </EuiTextColor>
+    <EuiToolTip content={space.description}>
+      <EuiTextColor color="subdued" className="eui-textBreakWord">
+        {description}
+      </EuiTextColor>
+    </EuiToolTip>
   );
 }
 

From 31bb2904901faab0afa074800cf5395aa77822e6 Mon Sep 17 00:00:00 2001
From: Weronika Olejniczak <weronika.olejniczak@elastic.co>
Date: Wed, 27 May 2026 17:31:48 +0200
Subject: [PATCH 2/2] chore(kibana-security): update snapshots

---
 .../index_privilege_form.test.tsx.snap        | 17 +++++++++++------
 ...mote_cluster_privileges_form.test.tsx.snap | 19 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
index e2e3ea194eed5..c86ccca9531ea 100644
--- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
+++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
@@ -135,12 +135,17 @@ exports[`it renders without crashing 1`] = `
     <EuiFlexItem
       grow={false}
     >
-      <EuiButtonIcon
-        aria-label="Delete index privilege"
-        color="danger"
-        iconType="trash"
-        onClick={[MockFunction]}
-      />
+      <EuiToolTip
+        content="Delete index privilege"
+        disableScreenReaderOutput={true}
+      >
+        <EuiButtonIcon
+          aria-label="Delete index privilege"
+          color="danger"
+          iconType="trash"
+          onClick={[MockFunction]}
+        />
+      </EuiToolTip>
     </EuiFlexItem>
   </EuiFlexGroup>
 </Fragment>
diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/remote_cluster_privileges_form.test.tsx.snap b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/remote_cluster_privileges_form.test.tsx.snap
index 228eef256bcd1..eba70f0943a6b 100644
--- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/remote_cluster_privileges_form.test.tsx.snap
+++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/es/__snapshots__/remote_cluster_privileges_form.test.tsx.snap
@@ -93,13 +93,18 @@ exports[`it renders without crashing 1`] = `
     <EuiFlexItem
       grow={false}
     >
-      <EuiButtonIcon
-        aria-label="Delete remote cluster privilege"
-        color="danger"
-        data-test-subj="deleteRemoteClusterPrivilegesButton0"
-        iconType="trash"
-        onClick={[MockFunction]}
-      />
+      <EuiToolTip
+        content="Delete remote cluster privilege"
+        disableScreenReaderOutput={true}
+      >
+        <EuiButtonIcon
+          aria-label="Delete remote cluster privilege"
+          color="danger"
+          data-test-subj="deleteRemoteClusterPrivilegesButton0"
+          iconType="trash"
+          onClick={[MockFunction]}
+        />
+      </EuiToolTip>
     </EuiFlexItem>
   </EuiFlexGroup>
 </Fragment>