diff --git a/x-pack/packages/security/ui_components/src/constants.ts b/x-pack/packages/security/ui_components/src/constants.ts
index a47a9bff9842d..d30c61bf02d6d 100644
--- a/x-pack/packages/security/ui_components/src/constants.ts
+++ b/x-pack/packages/security/ui_components/src/constants.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export const NO_PRIVILEGE_VALUE: string = 'none';
+export const NO_PRIVILEGE_VALUE = 'none' as const;
 export const CUSTOM_PRIVILEGE_VALUE: string = 'custom';
diff --git a/x-pack/packages/security/ui_components/src/kibana_privilege_table/change_all_privileges.tsx b/x-pack/packages/security/ui_components/src/kibana_privilege_table/change_all_privileges.tsx
index 4793f86a7a2a5..e475a5da7a106 100644
--- a/x-pack/packages/security/ui_components/src/kibana_privilege_table/change_all_privileges.tsx
+++ b/x-pack/packages/security/ui_components/src/kibana_privilege_table/change_all_privileges.tsx
@@ -15,9 +15,9 @@ import {
   EuiPopover,
   EuiText,
 } from '@elastic/eui';
-import _ from 'lodash';
 import React, { Component } from 'react';
 
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { KibanaPrivilege } from '@kbn/security-role-management-model';
 
@@ -38,6 +38,43 @@ export class ChangeAllPrivilegesControl extends Component<Props, State> {
     isPopoverOpen: false,
   };
 
+  private getPrivilegeCopy = (privilege: string): { label?: string; icon?: string } => {
+    switch (privilege) {
+      case 'all':
+        return {
+          icon: 'documentEdit',
+          label: i18n.translate(
+            'xpack.security.management.editRole.changeAllPrivileges.allSelectionLabel',
+            {
+              defaultMessage: 'Grant full access for all',
+            }
+          ),
+        };
+      case 'read':
+        return {
+          icon: 'glasses',
+          label: i18n.translate(
+            'xpack.security.management.editRole.changeAllPrivileges.readSelectionLabel',
+            {
+              defaultMessage: 'Grant read access for all',
+            }
+          ),
+        };
+      case 'none':
+        return {
+          icon: 'trash',
+          label: i18n.translate(
+            'xpack.security.management.editRole.changeAllPrivileges.noneSelectionLabel',
+            {
+              defaultMessage: 'Revoke access to all',
+            }
+          ),
+        };
+      default:
+        return {};
+    }
+  };
+
   public render() {
     const button = (
       <EuiLink
@@ -56,8 +93,10 @@ export class ChangeAllPrivilegesControl extends Component<Props, State> {
     );
 
     const items = this.props.privileges.map((privilege) => {
+      const { icon, label } = this.getPrivilegeCopy(privilege.id);
       return (
         <EuiContextMenuItem
+          icon={icon}
           key={privilege.id}
           data-test-subj={`changeAllPrivileges-${privilege.id}`}
           onClick={() => {
@@ -65,21 +104,24 @@ export class ChangeAllPrivilegesControl extends Component<Props, State> {
           }}
           disabled={this.props.disabled}
         >
-          {_.upperFirst(privilege.id)}
+          {label}
         </EuiContextMenuItem>
       );
     });
 
     items.push(
       <EuiContextMenuItem
+        icon={this.getPrivilegeCopy(NO_PRIVILEGE_VALUE).icon}
         key={NO_PRIVILEGE_VALUE}
         data-test-subj={`changeAllPrivileges-${NO_PRIVILEGE_VALUE}`}
         onClick={() => {
           this.onSelectPrivilege(NO_PRIVILEGE_VALUE);
         }}
         disabled={this.props.disabled}
+        // @ts-expect-error leaving this here so that when https://github.com/elastic/eui/issues/8123 is fixed we remove this comment
+        css={({ euiTheme }) => ({ color: euiTheme.colors.danger })}
       >
-        {_.upperFirst(NO_PRIVILEGE_VALUE)}
+        {this.getPrivilegeCopy(NO_PRIVILEGE_VALUE).label}
       </EuiContextMenuItem>
     );
 
diff --git a/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx b/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx
index 2c858e7bb6ff6..2ed172a49ad8b 100644
--- a/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx
+++ b/x-pack/packages/security/ui_components/src/kibana_privilege_table/feature_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiAccordion, EuiIconTip } from '@elastic/eui';
+import { EuiAccordion, EuiIconTip, EuiThemeProvider } from '@elastic/eui';
 import React from 'react';
 
 import type { KibanaFeature, SubFeatureConfig } from '@kbn/features-plugin/public';
@@ -47,16 +47,18 @@ const setup = (config: TestConfig) => {
   const onChange = jest.fn();
   const onChangeAll = jest.fn();
   const wrapper = mountWithIntl(
-    <FeatureTable
-      role={config.role}
-      privilegeCalculator={calculator}
-      kibanaPrivileges={kibanaPrivileges}
-      onChange={onChange}
-      onChangeAll={onChangeAll}
-      canCustomizeSubFeaturePrivileges={config.canCustomizeSubFeaturePrivileges}
-      privilegeIndex={config.privilegeIndex}
-      allSpacesSelected={true}
-    />
+    <EuiThemeProvider>
+      <FeatureTable
+        role={config.role}
+        privilegeCalculator={calculator}
+        kibanaPrivileges={kibanaPrivileges}
+        onChange={onChange}
+        onChangeAll={onChangeAll}
+        canCustomizeSubFeaturePrivileges={config.canCustomizeSubFeaturePrivileges}
+        privilegeIndex={config.privilegeIndex}
+        allSpacesSelected={true}
+      />
+    </EuiThemeProvider>
   );
 
   const displayedPrivileges = config.calculateDisplayedPrivileges
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
index 406e102b4529d..fb472191b561d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiButtonGroup } from '@elastic/eui';
+import { EuiButtonGroup, EuiThemeProvider } from '@elastic/eui';
 import React from 'react';
 
 import {
@@ -48,21 +48,28 @@ const displaySpaces: Space[] = [
   },
 ];
 
+const renderComponent = (props: React.ComponentProps<typeof PrivilegeSpaceForm>) => {
+  return mountWithIntl(
+    <EuiThemeProvider>
+      <PrivilegeSpaceForm {...props} />
+    </EuiThemeProvider>
+  );
+};
+
 describe('PrivilegeSpaceForm', () => {
   it('renders an empty form when the role contains no Kibana privileges', () => {
     const role = createRole();
     const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
 
-    const wrapper = mountWithIntl(
-      <PrivilegeSpaceForm
-        role={role}
-        spaces={displaySpaces}
-        kibanaPrivileges={kibanaPrivileges}
-        canCustomizeSubFeaturePrivileges={true}
-        onChange={jest.fn()}
-        onCancel={jest.fn()}
-      />
-    );
+    const wrapper = renderComponent({
+      role,
+      spaces: displaySpaces,
+      kibanaPrivileges,
+      privilegeIndex: -1,
+      canCustomizeSubFeaturePrivileges: true,
+      onChange: jest.fn(),
+      onCancel: jest.fn(),
+    });
 
     expect(
       wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
@@ -110,17 +117,15 @@ describe('PrivilegeSpaceForm', () => {
     ]);
     const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
 
-    const wrapper = mountWithIntl(
-      <PrivilegeSpaceForm
-        role={role}
-        spaces={displaySpaces}
-        kibanaPrivileges={kibanaPrivileges}
-        canCustomizeSubFeaturePrivileges={true}
-        privilegeIndex={0}
-        onChange={jest.fn()}
-        onCancel={jest.fn()}
-      />
-    );
+    const wrapper = renderComponent({
+      role,
+      spaces: displaySpaces,
+      kibanaPrivileges,
+      canCustomizeSubFeaturePrivileges: true,
+      privilegeIndex: 0,
+      onChange: jest.fn(),
+      onCancel: jest.fn(),
+    });
 
     expect(
       wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
@@ -178,17 +183,15 @@ describe('PrivilegeSpaceForm', () => {
     ]);
     const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
 
-    const wrapper = mountWithIntl(
-      <PrivilegeSpaceForm
-        role={role}
-        spaces={displaySpaces}
-        kibanaPrivileges={kibanaPrivileges}
-        canCustomizeSubFeaturePrivileges={true}
-        privilegeIndex={0}
-        onChange={jest.fn()}
-        onCancel={jest.fn()}
-      />
-    );
+    const wrapper = renderComponent({
+      role,
+      spaces: displaySpaces,
+      kibanaPrivileges,
+      canCustomizeSubFeaturePrivileges: true,
+      privilegeIndex: 0,
+      onChange: jest.fn(),
+      onCancel: jest.fn(),
+    });
 
     expect(
       wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
@@ -249,16 +252,15 @@ describe('PrivilegeSpaceForm', () => {
 
     const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
 
-    const wrapper = mountWithIntl(
-      <PrivilegeSpaceForm
-        role={role}
-        spaces={displaySpaces}
-        kibanaPrivileges={kibanaPrivileges}
-        canCustomizeSubFeaturePrivileges={true}
-        onChange={jest.fn()}
-        onCancel={jest.fn()}
-      />
-    );
+    const wrapper = renderComponent({
+      role,
+      spaces: displaySpaces,
+      kibanaPrivileges,
+      privilegeIndex: -1,
+      canCustomizeSubFeaturePrivileges: true,
+      onChange: jest.fn(),
+      onCancel: jest.fn(),
+    });
 
     wrapper.find(SpaceSelector).props().onChange(['*']);
 
@@ -286,17 +288,15 @@ describe('PrivilegeSpaceForm', () => {
     ]);
     const kibanaPrivileges = createKibanaPrivileges(kibanaFeatures);
 
-    const wrapper = mountWithIntl(
-      <PrivilegeSpaceForm
-        role={role}
-        spaces={displaySpaces}
-        kibanaPrivileges={kibanaPrivileges}
-        canCustomizeSubFeaturePrivileges={true}
-        privilegeIndex={0}
-        onChange={jest.fn()}
-        onCancel={jest.fn()}
-      />
-    );
+    const wrapper = renderComponent({
+      role,
+      spaces: displaySpaces,
+      kibanaPrivileges,
+      canCustomizeSubFeaturePrivileges: true,
+      privilegeIndex: 0,
+      onChange: jest.fn(),
+      onCancel: jest.fn(),
+    });
 
     expect(
       wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
@@ -360,17 +360,15 @@ describe('PrivilegeSpaceForm', () => {
 
     const onChange = jest.fn();
 
-    const wrapper = mountWithIntl(
-      <PrivilegeSpaceForm
-        role={role}
-        spaces={displaySpaces}
-        kibanaPrivileges={kibanaPrivileges}
-        canCustomizeSubFeaturePrivileges={true}
-        privilegeIndex={0}
-        onChange={onChange}
-        onCancel={jest.fn()}
-      />
-    );
+    const wrapper = renderComponent({
+      role,
+      spaces: displaySpaces,
+      kibanaPrivileges,
+      canCustomizeSubFeaturePrivileges: true,
+      privilegeIndex: 0,
+      onChange,
+      onCancel: jest.fn(),
+    });
 
     findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
     findTestSubject(wrapper, 'changeAllPrivileges-read').simulate('click');
@@ -418,17 +416,15 @@ describe('PrivilegeSpaceForm', () => {
 
     const canCustomize = Symbol('can customize') as unknown as boolean;
 
-    const wrapper = mountWithIntl(
-      <PrivilegeSpaceForm
-        role={role}
-        spaces={displaySpaces}
-        kibanaPrivileges={kibanaPrivileges}
-        canCustomizeSubFeaturePrivileges={canCustomize}
-        privilegeIndex={0}
-        onChange={onChange}
-        onCancel={jest.fn()}
-      />
-    );
+    const wrapper = renderComponent({
+      role,
+      spaces: displaySpaces,
+      kibanaPrivileges,
+      canCustomizeSubFeaturePrivileges: canCustomize,
+      privilegeIndex: 0,
+      onChange,
+      onCancel: jest.fn(),
+    });
 
     expect(wrapper.find(FeatureTable).props().canCustomizeSubFeaturePrivileges).toBe(canCustomize);
   });
@@ -464,17 +460,15 @@ describe('PrivilegeSpaceForm', () => {
       onChange.mockReset();
     });
     it('still allow other features privileges to be changed via "change read"', () => {
-      const wrapper = mountWithIntl(
-        <PrivilegeSpaceForm
-          role={role}
-          spaces={displaySpaces}
-          kibanaPrivileges={kibanaPrivileges}
-          canCustomizeSubFeaturePrivileges={true}
-          privilegeIndex={0}
-          onChange={onChange}
-          onCancel={jest.fn()}
-        />
-      );
+      const wrapper = renderComponent({
+        role,
+        spaces: displaySpaces,
+        kibanaPrivileges,
+        canCustomizeSubFeaturePrivileges: true,
+        privilegeIndex: 0,
+        onChange,
+        onCancel: jest.fn(),
+      });
 
       findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
       findTestSubject(wrapper, 'changeAllPrivileges-read').simulate('click');
@@ -510,17 +504,15 @@ describe('PrivilegeSpaceForm', () => {
     });
 
     it('still allow all privileges to be changed via "change all"', () => {
-      const wrapper = mountWithIntl(
-        <PrivilegeSpaceForm
-          role={role}
-          spaces={displaySpaces}
-          kibanaPrivileges={kibanaPrivileges}
-          canCustomizeSubFeaturePrivileges={true}
-          privilegeIndex={0}
-          onChange={onChange}
-          onCancel={jest.fn()}
-        />
-      );
+      const wrapper = renderComponent({
+        role,
+        spaces: displaySpaces,
+        kibanaPrivileges,
+        canCustomizeSubFeaturePrivileges: true,
+        privilegeIndex: 0,
+        onChange,
+        onCancel: jest.fn(),
+      });
 
       findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
       findTestSubject(wrapper, 'changeAllPrivileges-all').simulate('click');
@@ -587,17 +579,15 @@ describe('PrivilegeSpaceForm', () => {
     });
 
     it('still allow all features privileges to be changed via "change read" in foo space', () => {
-      const wrapper = mountWithIntl(
-        <PrivilegeSpaceForm
-          role={role}
-          spaces={displaySpaces}
-          kibanaPrivileges={kibanaPrivileges}
-          canCustomizeSubFeaturePrivileges={true}
-          privilegeIndex={0}
-          onChange={onChange}
-          onCancel={jest.fn()}
-        />
-      );
+      const wrapper = renderComponent({
+        role,
+        spaces: displaySpaces,
+        kibanaPrivileges,
+        canCustomizeSubFeaturePrivileges: true,
+        privilegeIndex: 0,
+        onChange,
+        onCancel: jest.fn(),
+      });
 
       findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
       findTestSubject(wrapper, 'changeAllPrivileges-read').simulate('click');
@@ -631,17 +621,15 @@ describe('PrivilegeSpaceForm', () => {
     });
 
     it('still allow other features privileges to be changed via "change all" in foo space', () => {
-      const wrapper = mountWithIntl(
-        <PrivilegeSpaceForm
-          role={role}
-          spaces={displaySpaces}
-          kibanaPrivileges={kibanaPrivileges}
-          canCustomizeSubFeaturePrivileges={true}
-          privilegeIndex={0}
-          onChange={onChange}
-          onCancel={jest.fn()}
-        />
-      );
+      const wrapper = renderComponent({
+        role,
+        spaces: displaySpaces,
+        kibanaPrivileges,
+        canCustomizeSubFeaturePrivileges: true,
+        privilegeIndex: 0,
+        onChange,
+        onCancel: jest.fn(),
+      });
 
       findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
       findTestSubject(wrapper, 'changeAllPrivileges-all').simulate('click');
@@ -692,17 +680,15 @@ describe('PrivilegeSpaceForm', () => {
           spaces: ['bar'],
         },
       ]);
-      const wrapper = mountWithIntl(
-        <PrivilegeSpaceForm
-          role={roleAllSpace}
-          spaces={displaySpaces}
-          kibanaPrivileges={kibanaPrivileges}
-          canCustomizeSubFeaturePrivileges={true}
-          privilegeIndex={0}
-          onChange={onChange}
-          onCancel={jest.fn()}
-        />
-      );
+      const wrapper = renderComponent({
+        role: roleAllSpace,
+        spaces: displaySpaces,
+        kibanaPrivileges,
+        canCustomizeSubFeaturePrivileges: true,
+        privilegeIndex: 0,
+        onChange,
+        onCancel: jest.fn(),
+      });
 
       findTestSubject(wrapper, 'changeAllPrivilegesButton').simulate('click');
       findTestSubject(wrapper, 'changeAllPrivileges-all').simulate('click');
diff --git a/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.test.tsx
index 7f15a54e095a6..1c97b9c4d2bc6 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/roles/component/space_assign_role_privilege_form.test.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { EuiThemeProvider } from '@elastic/eui';
 import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import crypto from 'crypto';
@@ -81,46 +82,48 @@ const renderPrivilegeRolesForm = ({
   preSelectedRoles?: Role[];
 } = {}) => {
   return render(
-    <IntlProvider locale="en">
-      <EditSpaceProvider
-        {...{
-          logger,
-          i18n,
-          http,
-          theme,
-          overlays,
-          notifications,
-          spacesManager,
-          serverBasePath: '',
-          getUrlForApp: jest.fn((_) => _),
-          navigateToUrl: jest.fn(),
-          license: licenseMock,
-          isRoleManagementEnabled: true,
-          capabilities: {
-            navLinks: {},
-            management: {},
-            catalogue: {},
-            spaces: { manage: true },
-          },
-          dispatch: dispatchMock,
-          state: {
-            roles: new Map(),
-            fetchRolesError: false,
-          },
-          invokeClient: spacesClientsInvocatorMock,
-        }}
-      >
-        <PrivilegesRolesForm
+    <EuiThemeProvider>
+      <IntlProvider locale="en">
+        <EditSpaceProvider
           {...{
-            space,
-            features: kibanaFeatures,
-            closeFlyout,
-            defaultSelected: preSelectedRoles,
-            onSaveCompleted,
+            logger,
+            i18n,
+            http,
+            theme,
+            overlays,
+            notifications,
+            spacesManager,
+            serverBasePath: '',
+            getUrlForApp: jest.fn((_) => _),
+            navigateToUrl: jest.fn(),
+            license: licenseMock,
+            isRoleManagementEnabled: true,
+            capabilities: {
+              navLinks: {},
+              management: {},
+              catalogue: {},
+              spaces: { manage: true },
+            },
+            dispatch: dispatchMock,
+            state: {
+              roles: new Map(),
+              fetchRolesError: false,
+            },
+            invokeClient: spacesClientsInvocatorMock,
           }}
-        />
-      </EditSpaceProvider>
-    </IntlProvider>
+        >
+          <PrivilegesRolesForm
+            {...{
+              space,
+              features: kibanaFeatures,
+              closeFlyout,
+              defaultSelected: preSelectedRoles,
+              onSaveCompleted,
+            }}
+          />
+        </EditSpaceProvider>
+      </IntlProvider>
+    </EuiThemeProvider>
   );
 };