diff --git a/package.json b/package.json
index 404cb192976d6..808c068cb878a 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.4.0-canary.1",
     "@elastic/ems-client": "8.3.3",
-    "@elastic/eui": "67.1.8",
+    "@elastic/eui": "70.2.4",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 1475e5fbedd01..4af92461be626 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -17,7 +17,7 @@ Array [
       type="button"
     />
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       style="flex-shrink: 0;"
     >
       <div
@@ -29,20 +29,20 @@ Array [
           class="euiCollapsibleNavGroup__children"
         >
           <ul
-            class="euiListGroup"
-            style="max-width: none;"
+            class="euiListGroup emotion-euiListGroup-none"
+            style="max-inline-size: none;"
           >
             <li
-              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--ghost euiListGroupItem-isClickable"
+              class="euiListGroupItem emotion-euiListGroupItem-text-s"
             >
               <a
-                class="euiListGroupItem__button"
+                class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-text-isClickable"
                 data-test-subj="collapsibleNavCustomNavLink"
                 href="Custom link"
                 rel="noreferrer"
               >
                 <span
-                  class="euiListGroupItem__label"
+                  class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                   title="Custom link"
                 >
                   Custom link
@@ -57,7 +57,7 @@ Array [
       class="euiHorizontalRule euiHorizontalRule--full emotion-euiHorizontalRule-full"
     />
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       style="flex-shrink: 0;"
     >
       <div
@@ -70,25 +70,25 @@ Array [
         >
           <ul
             aria-label="Pinned links"
-            class="euiListGroup"
-            style="max-width: none;"
+            class="euiListGroup emotion-euiListGroup-none"
+            style="max-inline-size: none;"
           >
             <li
-              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+              class="euiListGroupItem emotion-euiListGroupItem-text-s"
             >
               <a
-                class="euiListGroupItem__button"
+                class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-text-isClickable"
                 data-test-subj="homeLink"
                 href="/"
                 rel="noreferrer"
               >
                 <span
-                  class="euiListGroupItem__icon"
+                  class="euiListGroupItem__icon emotion-euiListGroupItem__icon"
                   color="inherit"
                   data-euiicon-type="home"
                 />
                 <span
-                  class="euiListGroupItem__label"
+                  class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                   title="Home"
                 >
                   Home
@@ -117,10 +117,10 @@ Array [
             class="euiAccordion__buttonContent"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-m-flexStart-center-row"
             >
               <div
-                class="euiFlexItem"
+                class="euiFlexItem emotion-euiFlexItem-grow-1"
               >
                 <h3
                   class="euiTitle euiCollapsibleNavGroup__title emotion-euiTitle-xxs"
@@ -164,22 +164,22 @@ Array [
             >
               <ul
                 aria-label="Recently viewed links"
-                class="euiListGroup kbnCollapsibleNav__recentsListGroup"
-                style="max-width: none;"
+                class="euiListGroup kbnCollapsibleNav__recentsListGroup emotion-euiListGroup-none"
+                style="max-inline-size: none;"
               >
                 <li
-                  class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                  class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                 >
                   <a
                     aria-label="recent 1"
-                    class="euiListGroupItem__button"
+                    class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                     data-test-subj="collapsibleNavAppLink--recent"
                     href="http://localhost/recent%201"
                     rel="noreferrer"
                     title="recent 1"
                   >
                     <span
-                      class="euiListGroupItem__label"
+                      class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                       title="recent 1"
                     >
                       recent 1
@@ -187,18 +187,18 @@ Array [
                   </a>
                 </li>
                 <li
-                  class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                  class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                 >
                   <a
                     aria-label="recent 2"
-                    class="euiListGroupItem__button"
+                    class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                     data-test-subj="collapsibleNavAppLink--recent"
                     href="http://localhost/recent%202"
                     rel="noreferrer"
                     title="recent 2"
                   >
                     <span
-                      class="euiListGroupItem__label"
+                      class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                       title="recent 2"
                     >
                       recent 2
@@ -215,7 +215,7 @@ Array [
       class="euiHorizontalRule euiHorizontalRule--full emotion-euiHorizontalRule-full"
     />
     <div
-      class="euiFlexItem eui-yScroll"
+      class="euiFlexItem eui-yScroll emotion-euiFlexItem-grow-1"
     >
       <div
         class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
@@ -235,17 +235,17 @@ Array [
               class="euiAccordion__buttonContent"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                class="euiFlexGroup emotion-euiFlexGroup-m-flexStart-center-row"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <span
                     data-euiicon-type="logoKibana"
                   />
                 </div>
                 <div
-                  class="euiFlexItem"
+                  class="euiFlexItem emotion-euiFlexItem-grow-1"
                 >
                   <h3
                     class="euiTitle euiCollapsibleNavGroup__title emotion-euiTitle-xxs"
@@ -289,20 +289,20 @@ Array [
               >
                 <ul
                   aria-label="Primary navigation links, Analytics"
-                  class="euiListGroup"
-                  style="max-width: none;"
+                  class="euiListGroup emotion-euiListGroup-none"
+                  style="max-inline-size: none;"
                 >
                   <li
-                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                    class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                   >
                     <a
-                      class="euiListGroupItem__button"
+                      class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                       data-test-subj="collapsibleNavAppLink"
                       href="discover"
                       rel="noreferrer"
                     >
                       <span
-                        class="euiListGroupItem__label"
+                        class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                         title="discover"
                       >
                         discover
@@ -310,16 +310,16 @@ Array [
                     </a>
                   </li>
                   <li
-                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                    class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                   >
                     <a
-                      class="euiListGroupItem__button"
+                      class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                       data-test-subj="collapsibleNavAppLink"
                       href="visualize"
                       rel="noreferrer"
                     >
                       <span
-                        class="euiListGroupItem__label"
+                        class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                         title="visualize"
                       >
                         visualize
@@ -327,16 +327,16 @@ Array [
                     </a>
                   </li>
                   <li
-                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                    class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                   >
                     <a
-                      class="euiListGroupItem__button"
+                      class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                       data-test-subj="collapsibleNavAppLink"
                       href="dashboard"
                       rel="noreferrer"
                     >
                       <span
-                        class="euiListGroupItem__label"
+                        class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                         title="dashboard"
                       >
                         dashboard
@@ -367,17 +367,17 @@ Array [
               class="euiAccordion__buttonContent"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                class="euiFlexGroup emotion-euiFlexGroup-m-flexStart-center-row"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <span
                     data-euiicon-type="logoObservability"
                   />
                 </div>
                 <div
-                  class="euiFlexItem"
+                  class="euiFlexItem emotion-euiFlexItem-grow-1"
                 >
                   <h3
                     class="euiTitle euiCollapsibleNavGroup__title emotion-euiTitle-xxs"
@@ -421,20 +421,20 @@ Array [
               >
                 <ul
                   aria-label="Primary navigation links, Observability"
-                  class="euiListGroup"
-                  style="max-width: none;"
+                  class="euiListGroup emotion-euiListGroup-none"
+                  style="max-inline-size: none;"
                 >
                   <li
-                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                    class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                   >
                     <a
-                      class="euiListGroupItem__button"
+                      class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                       data-test-subj="collapsibleNavAppLink"
                       href="metrics"
                       rel="noreferrer"
                     >
                       <span
-                        class="euiListGroupItem__label"
+                        class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                         title="metrics"
                       >
                         metrics
@@ -442,16 +442,16 @@ Array [
                     </a>
                   </li>
                   <li
-                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                    class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                   >
                     <a
-                      class="euiListGroupItem__button"
+                      class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                       data-test-subj="collapsibleNavAppLink"
                       href="logs"
                       rel="noreferrer"
                     >
                       <span
-                        class="euiListGroupItem__label"
+                        class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                         title="logs"
                       >
                         logs
@@ -482,17 +482,17 @@ Array [
               class="euiAccordion__buttonContent"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                class="euiFlexGroup emotion-euiFlexGroup-m-flexStart-center-row"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <span
                     data-euiicon-type="logoSecurity"
                   />
                 </div>
                 <div
-                  class="euiFlexItem"
+                  class="euiFlexItem emotion-euiFlexItem-grow-1"
                 >
                   <h3
                     class="euiTitle euiCollapsibleNavGroup__title emotion-euiTitle-xxs"
@@ -536,20 +536,20 @@ Array [
               >
                 <ul
                   aria-label="Primary navigation links, Security"
-                  class="euiListGroup"
-                  style="max-width: none;"
+                  class="euiListGroup emotion-euiListGroup-none"
+                  style="max-inline-size: none;"
                 >
                   <li
-                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                    class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                   >
                     <a
-                      class="euiListGroupItem__button"
+                      class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                       data-test-subj="collapsibleNavAppLink"
                       href="siem"
                       rel="noreferrer"
                     >
                       <span
-                        class="euiListGroupItem__label"
+                        class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                         title="siem"
                       >
                         siem
@@ -580,17 +580,17 @@ Array [
               class="euiAccordion__buttonContent"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                class="euiFlexGroup emotion-euiFlexGroup-m-flexStart-center-row"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <span
                     data-euiicon-type="managementApp"
                   />
                 </div>
                 <div
-                  class="euiFlexItem"
+                  class="euiFlexItem emotion-euiFlexItem-grow-1"
                 >
                   <h3
                     class="euiTitle euiCollapsibleNavGroup__title emotion-euiTitle-xxs"
@@ -634,20 +634,20 @@ Array [
               >
                 <ul
                   aria-label="Primary navigation links, Management"
-                  class="euiListGroup"
-                  style="max-width: none;"
+                  class="euiListGroup emotion-euiListGroup-none"
+                  style="max-inline-size: none;"
                 >
                   <li
-                    class="euiListGroupItem euiListGroupItem--small euiListGroupItem--subdued euiListGroupItem-isClickable"
+                    class="euiListGroupItem emotion-euiListGroupItem-subdued-s"
                   >
                     <a
-                      class="euiListGroupItem__button"
+                      class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-subdued-isClickable"
                       data-test-subj="collapsibleNavAppLink"
                       href="monitoring"
                       rel="noreferrer"
                     >
                       <span
-                        class="euiListGroupItem__label"
+                        class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                         title="monitoring"
                       >
                         monitoring
@@ -669,19 +669,19 @@ Array [
           class="euiCollapsibleNavGroup__children"
         >
           <ul
-            class="euiListGroup euiListGroup-flush euiListGroup--gutterSmall euiListGroup-maxWidthDefault"
+            class="euiListGroup emotion-euiListGroup-s-flush-maxWidthDefault"
           >
             <li
-              class="euiListGroupItem euiListGroupItem--small euiListGroupItem--text euiListGroupItem-isClickable"
+              class="euiListGroupItem emotion-euiListGroupItem-text-s"
             >
               <a
-                class="euiListGroupItem__button"
+                class="euiListGroupItem__button emotion-euiListGroupItem__inner-s-text-isClickable"
                 data-test-subj="collapsibleNavAppLink"
                 href="canvas"
                 rel="noreferrer"
               >
                 <span
-                  class="euiListGroupItem__label"
+                  class="euiListGroupItem__label emotion-euiListGroupItem__label-truncate"
                   title="canvas"
                 >
                   canvas
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx
index 4a9ac3a624486..2d9d88d9a461b 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx
@@ -8,6 +8,7 @@
 
 import './collapsible_nav.scss';
 import {
+  EuiThemeProvider,
   EuiCollapsibleNav,
   EuiCollapsibleNavGroup,
   EuiFlexItem,
@@ -19,7 +20,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { groupBy, sortBy } from 'lodash';
-import React, { Fragment, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import * as Rx from 'rxjs';
 import type { HttpStart } from '@kbn/core-http-browser';
@@ -162,35 +163,35 @@ export function CollapsibleNav({
       size={248}
     >
       {customNavLink && (
-        <Fragment>
+        <>
           <EuiFlexItem grow={false} style={{ flexShrink: 0 }}>
             <EuiCollapsibleNavGroup
               background="dark"
               className="eui-yScroll"
               style={{ maxHeight: '40vh' }}
             >
-              <EuiListGroup
-                listItems={[
-                  createEuiListItem({
-                    link: customNavLink,
-                    basePath,
-                    navigateToUrl,
-                    dataTestSubj: 'collapsibleNavCustomNavLink',
-                    onClick: closeNav,
-                    externalLink: true,
-                    iconProps: { color: 'ghost' },
-                  }),
-                ]}
-                maxWidth="none"
-                gutterSize="none"
-                size="s"
-                color="ghost"
-              />
+              <EuiThemeProvider colorMode="dark">
+                <EuiListGroup
+                  listItems={[
+                    createEuiListItem({
+                      link: customNavLink,
+                      basePath,
+                      navigateToUrl,
+                      dataTestSubj: 'collapsibleNavCustomNavLink',
+                      onClick: closeNav,
+                      externalLink: true,
+                    }),
+                  ]}
+                  maxWidth="none"
+                  gutterSize="none"
+                  size="s"
+                />
+              </EuiThemeProvider>
             </EuiCollapsibleNavGroup>
           </EuiFlexItem>
 
           <EuiHorizontalRule margin="none" />
-        </Fragment>
+        </>
       )}
 
       {/* Pinned items */}
diff --git a/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap b/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap
index a1691641dcab2..19bdd11212924 100644
--- a/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap
+++ b/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap
@@ -27,9 +27,9 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiCardSelect.select": "Select",
           "euiCardSelect.selected": "Selected",
           "euiCardSelect.unavailable": "Unavailable",
-          "euiCodeBlock.copyButton": "Copy",
-          "euiCodeBlock.fullscreenCollapse": "Collapse",
-          "euiCodeBlock.fullscreenExpand": "Expand",
+          "euiCodeBlockCopy.copy": "Copy",
+          "euiCodeBlockFullScreen.fullscreenCollapse": "Collapse",
+          "euiCodeBlockFullScreen.fullscreenExpand": "Expand",
           "euiCollapsedItemActions.allActions": "All actions",
           "euiColorPicker.alphaLabel": "Alpha channel (opacity) value",
           "euiColorPicker.closeLabel": "Press the down key to open a popover containing color options",
@@ -147,6 +147,30 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiHue.label": "Select the HSV color mode \\"hue\\" value",
           "euiImageButton.closeFullScreen": "Press Escape or click to close image fullscreen mode",
           "euiImageButton.openFullScreen": "Click to open this image in fullscreen mode",
+          "euiKeyboardShortcuts.ctrl": "Ctrl",
+          "euiKeyboardShortcuts.ctrlEndDescription": "Move to the last cell of the current page",
+          "euiKeyboardShortcuts.ctrlHomeDescription": "Move to the first cell of the current page",
+          "euiKeyboardShortcuts.downArrowDescription": "Move one cell down",
+          "euiKeyboardShortcuts.downArrowTitle": "Down arrow",
+          "euiKeyboardShortcuts.endDescription": "Move to the last cell of the current row",
+          "euiKeyboardShortcuts.endTitle": "End",
+          "euiKeyboardShortcuts.enterDescription": "Open cell details and actions",
+          "euiKeyboardShortcuts.enterTitle": "Enter",
+          "euiKeyboardShortcuts.escapeDescription": "Close cell details and actions",
+          "euiKeyboardShortcuts.escapeTitle": "Escape",
+          "euiKeyboardShortcuts.homeDescription": "Move to the first cell of the current row",
+          "euiKeyboardShortcuts.homeTitle": "Home",
+          "euiKeyboardShortcuts.leftArrowDescription": "Move one cell left",
+          "euiKeyboardShortcuts.leftArrowTitle": "Left arrow",
+          "euiKeyboardShortcuts.pageDownDescription": "Go to the first row of the next page",
+          "euiKeyboardShortcuts.pageDownTitle": "Page Down",
+          "euiKeyboardShortcuts.pageUpDescription": "Go to the last row of the previous page",
+          "euiKeyboardShortcuts.pageUpTitle": "Page Up",
+          "euiKeyboardShortcuts.rightArrowDescription": "Move one cell right",
+          "euiKeyboardShortcuts.rightArrowTitle": "Right arrow",
+          "euiKeyboardShortcuts.title": "Keyboard shortcuts",
+          "euiKeyboardShortcuts.upArrowDescription": "Move one cell up",
+          "euiKeyboardShortcuts.upArrowTitle": "Up arrow",
           "euiLink.external.ariaLabel": "External link",
           "euiLink.newTarget.screenReaderOnlyText": "(opens in a new tab or window)",
           "euiLoadingChart.ariaLabel": "Loading",
diff --git a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx
index 15c323ca4036d..c5237b50c2f08 100644
--- a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx
+++ b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx
@@ -125,18 +125,24 @@ export const getEuiContextMapping = (): EuiTokensObject => {
       defaultMessage: 'Unavailable',
       description: 'Displayed button text when a card option is unavailable.',
     }),
-    'euiCodeBlock.copyButton': i18n.translate('core.euiCodeBlock.copyButton', {
+    'euiCodeBlockCopy.copy': i18n.translate('core.euiCodeBlockCopy.copy', {
       defaultMessage: 'Copy',
       description: 'ARIA label for a button that copies source code text to the clipboard',
     }),
-    'euiCodeBlock.fullscreenCollapse': i18n.translate('core.euiCodeBlock.fullscreenCollapse', {
-      defaultMessage: 'Collapse',
-      description: 'ARIA label for a button that exits fullscreen view',
-    }),
-    'euiCodeBlock.fullscreenExpand': i18n.translate('core.euiCodeBlock.fullscreenExpand', {
-      defaultMessage: 'Expand',
-      description: 'ARIA label for a button that enters fullscreen view',
-    }),
+    'euiCodeBlockFullScreen.fullscreenCollapse': i18n.translate(
+      'core.euiCodeBlockFullScreen.fullscreenCollapse',
+      {
+        defaultMessage: 'Collapse',
+        description: 'ARIA label for a button that exits fullscreen view',
+      }
+    ),
+    'euiCodeBlockFullScreen.fullscreenExpand': i18n.translate(
+      'core.euiCodeBlockFullScreen.fullscreenExpand',
+      {
+        defaultMessage: 'Expand',
+        description: 'ARIA label for a button that enters fullscreen view',
+      }
+    ),
     'euiCollapsedItemActions.allActions': i18n.translate(
       'core.euiCollapsedItemActions.allActions',
       {
@@ -385,6 +391,126 @@ export const getEuiContextMapping = (): EuiTokensObject => {
           'There is a new region landmark called {landmarkHeading} with page level controls at the end of the document.',
         values: { landmarkHeading },
       }),
+    'euiKeyboardShortcuts.title': i18n.translate('core.euiKeyboardShortcuts.title', {
+      defaultMessage: 'Keyboard shortcuts',
+    }),
+    'euiKeyboardShortcuts.upArrowTitle': i18n.translate('core.euiKeyboardShortcuts.upArrowTitle', {
+      defaultMessage: 'Up arrow',
+    }),
+    'euiKeyboardShortcuts.upArrowDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.upArrowDescription',
+      {
+        defaultMessage: 'Move one cell up',
+      }
+    ),
+    'euiKeyboardShortcuts.downArrowTitle': i18n.translate(
+      'core.euiKeyboardShortcuts.downArrowTitle',
+      {
+        defaultMessage: 'Down arrow',
+      }
+    ),
+    'euiKeyboardShortcuts.downArrowDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.downArrowDescription',
+      {
+        defaultMessage: 'Move one cell down',
+      }
+    ),
+    'euiKeyboardShortcuts.rightArrowTitle': i18n.translate(
+      'core.euiKeyboardShortcuts.rightArrowTitle',
+      {
+        defaultMessage: 'Right arrow',
+      }
+    ),
+    'euiKeyboardShortcuts.rightArrowDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.rightArrowDescription',
+      {
+        defaultMessage: 'Move one cell right',
+      }
+    ),
+    'euiKeyboardShortcuts.leftArrowTitle': i18n.translate(
+      'core.euiKeyboardShortcuts.leftArrowTitle',
+      {
+        defaultMessage: 'Left arrow',
+      }
+    ),
+    'euiKeyboardShortcuts.leftArrowDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.leftArrowDescription',
+      {
+        defaultMessage: 'Move one cell left',
+      }
+    ),
+    'euiKeyboardShortcuts.homeTitle': i18n.translate('core.euiKeyboardShortcuts.homeTitle', {
+      defaultMessage: 'Home',
+    }),
+    'euiKeyboardShortcuts.homeDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.homeDescription',
+      {
+        defaultMessage: 'Move to the first cell of the current row',
+      }
+    ),
+    'euiKeyboardShortcuts.endTitle': i18n.translate('core.euiKeyboardShortcuts.endTitle', {
+      defaultMessage: 'End',
+    }),
+    'euiKeyboardShortcuts.endDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.endDescription',
+      {
+        defaultMessage: 'Move to the last cell of the current row',
+      }
+    ),
+    'euiKeyboardShortcuts.ctrl': i18n.translate('core.euiKeyboardShortcuts.ctrl', {
+      defaultMessage: 'Ctrl',
+    }),
+    'euiKeyboardShortcuts.ctrlHomeDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.ctrlHomeDescription',
+      {
+        defaultMessage: 'Move to the first cell of the current page',
+      }
+    ),
+    'euiKeyboardShortcuts.ctrlEndDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.ctrlEndDescription',
+      {
+        defaultMessage: 'Move to the last cell of the current page',
+      }
+    ),
+    'euiKeyboardShortcuts.pageUpTitle': i18n.translate('core.euiKeyboardShortcuts.pageUpTitle', {
+      defaultMessage: 'Page Up',
+    }),
+    'euiKeyboardShortcuts.pageUpDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.pageUpDescription',
+      {
+        defaultMessage: 'Go to the last row of the previous page',
+      }
+    ),
+    'euiKeyboardShortcuts.pageDownTitle': i18n.translate(
+      'core.euiKeyboardShortcuts.pageDownTitle',
+      {
+        defaultMessage: 'Page Down',
+      }
+    ),
+    'euiKeyboardShortcuts.pageDownDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.pageDownDescription',
+      {
+        defaultMessage: 'Go to the first row of the next page',
+      }
+    ),
+    'euiKeyboardShortcuts.enterTitle': i18n.translate('core.euiKeyboardShortcuts.enterTitle', {
+      defaultMessage: 'Enter',
+    }),
+    'euiKeyboardShortcuts.enterDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.enterDescription',
+      {
+        defaultMessage: 'Open cell details and actions',
+      }
+    ),
+    'euiKeyboardShortcuts.escapeTitle': i18n.translate('core.euiKeyboardShortcuts.escapeTitle', {
+      defaultMessage: 'Escape',
+    }),
+    'euiKeyboardShortcuts.escapeDescription': i18n.translate(
+      'core.euiKeyboardShortcuts.escapeDescription',
+      {
+        defaultMessage: 'Close cell details and actions',
+      }
+    ),
     'euiDataGrid.screenReaderNotice': i18n.translate('core.euiDataGrid.screenReaderNotice', {
       defaultMessage: 'Cell contains interactive content.',
     }),
diff --git a/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap b/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap
index ae55761e0cbd4..2b5f564dfb3ee 100644
--- a/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap
@@ -148,7 +148,7 @@ exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `
         </span>
       </button>
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
         data-test-subj="confirmModalConfirmButton"
         type="button"
       >
@@ -348,7 +348,7 @@ exports[`ModalService openConfirm() renders a string confirm message 2`] = `
         </span>
       </button>
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
         data-test-subj="confirmModalConfirmButton"
         type="button"
       >
diff --git a/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap b/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap
index 1a32d9ace74f4..9919f56bdf111 100644
--- a/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap
+++ b/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap
@@ -2,110 +2,114 @@
 
 exports[`SampleDataCard installed renders with app links 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasShadow-euiCard-left-vertical-hasBetaBadge"
+  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasShadow-euiCard-left-hasBetaBadge"
   data-test-subj="sampleDataSetCardsample-data-set"
 >
   <div
-    class="euiCard__top emotion-euiCard__top-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
     <div
-      class="euiCard__image emotion-euiCard__image"
+      class="euiCard__top emotion-euiCard__top-vertical"
     >
-      <img
-        alt=""
-        src="test-file-stub"
-      />
-    </div>
-  </div>
-  <div
-    class="euiCard__content emotion-euiCard__content-vertical"
-  >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-left"
+      <div
+        class="euiCard__image emotion-euiCard__image"
       >
-        Sample Data Set
-      </span>
-    </p>
+        <img
+          alt=""
+          src="test-file-stub"
+        />
+      </div>
+    </div>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        This is a sample data set you can use.
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-left"
+        >
+          Sample Data Set
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          This is a sample data set you can use.
+        </p>
+      </div>
     </div>
-  </div>
-  <span
-    class="emotion-euiCard__betaBadgeAnchor"
-  >
     <span
-      class="euiBetaBadge euiBetaBadge--hollow emotion-euiCard__betaBadge"
-      id="generated-idBetaBadge"
-      title="installed"
+      class="emotion-euiCard__betaBadgeAnchor"
     >
-      installed
+      <span
+        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
+        id="generated-idBetaBadge"
+        title="installed"
+      >
+        installed
+      </span>
     </span>
-  </span>
-  <div
-    class="emotion-euiCard__footer"
-  >
     <div
-      class="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+      class="emotion-euiCard__footer"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexGroup emotion-euiFlexGroup-none-spaceBetween-stretch-row"
       >
-        <button
-          aria-label="Remove Sample Data Set"
-          class="euiButtonEmpty euiButtonEmpty--flushLeft css-1v3a3p6-empty-danger"
-          data-test-subj="removeSampleDataSetsample-data-set"
-          type="button"
+        <div
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
-          <span
-            class="euiButtonContent euiButtonEmpty__content"
+          <button
+            aria-label="Remove Sample Data Set"
+            class="euiButtonEmpty euiButtonEmpty--flushLeft css-1v3a3p6-empty-danger"
+            data-test-subj="removeSampleDataSetsample-data-set"
+            type="button"
           >
             <span
-              class="euiButtonEmpty__text"
+              class="euiButtonContent euiButtonEmpty__content"
             >
-              Remove
+              <span
+                class="euiButtonEmpty__text"
+              >
+                Remove
+              </span>
             </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
+          </button>
+        </div>
         <div
-          class="euiPopover emotion-euiPopover"
-          data-test-subj="launchSampleDataSetsample-data-set"
-          id="sampleDataLinkssample-data-set"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
-            class="euiPopover__anchor css-16vtueo-render"
+            class="euiPopover emotion-euiPopover"
+            data-test-subj="launchSampleDataSetsample-data-set"
+            id="sampleDataLinkssample-data-set"
           >
-            <button
-              aria-label="View Sample Data Set"
-              class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-              type="button"
+            <div
+              class="euiPopover__anchor css-16vtueo-render"
             >
-              <span
-                class="emotion-euiButtonDisplayContent"
+              <button
+                aria-label="View Sample Data Set"
+                class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+                type="button"
               >
                 <span
-                  class="eui-textTruncate"
+                  class="emotion-euiButtonDisplayContent"
                 >
-                  View data
+                  <span
+                    class="eui-textTruncate"
+                  >
+                    View data
+                  </span>
+                  <span
+                    color="inherit"
+                    data-euiicon-type="arrowDown"
+                  />
                 </span>
-                <span
-                  color="inherit"
-                  data-euiicon-type="arrowDown"
-                />
-              </span>
-            </button>
+              </button>
+            </div>
           </div>
         </div>
       </div>
@@ -116,99 +120,103 @@ exports[`SampleDataCard installed renders with app links 1`] = `
 
 exports[`SampleDataCard installed renders without app links 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasShadow-euiCard-left-vertical-hasBetaBadge"
+  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasShadow-euiCard-left-hasBetaBadge"
   data-test-subj="sampleDataSetCardsample-data-set"
 >
   <div
-    class="euiCard__top emotion-euiCard__top-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
     <div
-      class="euiCard__image emotion-euiCard__image"
+      class="euiCard__top emotion-euiCard__top-vertical"
     >
-      <img
-        alt=""
-        src="test-file-stub"
-      />
-    </div>
-  </div>
-  <div
-    class="euiCard__content emotion-euiCard__content-vertical"
-  >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-left"
+      <div
+        class="euiCard__image emotion-euiCard__image"
       >
-        Sample Data Set
-      </span>
-    </p>
+        <img
+          alt=""
+          src="test-file-stub"
+        />
+      </div>
+    </div>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        This is a sample data set you can use.
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-left"
+        >
+          Sample Data Set
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          This is a sample data set you can use.
+        </p>
+      </div>
     </div>
-  </div>
-  <span
-    class="emotion-euiCard__betaBadgeAnchor"
-  >
     <span
-      class="euiBetaBadge euiBetaBadge--hollow emotion-euiCard__betaBadge"
-      id="generated-idBetaBadge"
-      title="installed"
+      class="emotion-euiCard__betaBadgeAnchor"
     >
-      installed
+      <span
+        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
+        id="generated-idBetaBadge"
+        title="installed"
+      >
+        installed
+      </span>
     </span>
-  </span>
-  <div
-    class="emotion-euiCard__footer"
-  >
     <div
-      class="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+      class="emotion-euiCard__footer"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexGroup emotion-euiFlexGroup-none-spaceBetween-stretch-row"
       >
-        <button
-          aria-label="Remove Sample Data Set"
-          class="euiButtonEmpty euiButtonEmpty--flushLeft css-1v3a3p6-empty-danger"
-          data-test-subj="removeSampleDataSetsample-data-set"
-          type="button"
+        <div
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
-          <span
-            class="euiButtonContent euiButtonEmpty__content"
+          <button
+            aria-label="Remove Sample Data Set"
+            class="euiButtonEmpty euiButtonEmpty--flushLeft css-1v3a3p6-empty-danger"
+            data-test-subj="removeSampleDataSetsample-data-set"
+            type="button"
           >
             <span
-              class="euiButtonEmpty__text"
+              class="euiButtonContent euiButtonEmpty__content"
             >
-              Remove
+              <span
+                class="euiButtonEmpty__text"
+              >
+                Remove
+              </span>
             </span>
-          </span>
-        </button>
-      </div>
-      <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
-      >
-        <button
-          aria-label="View Sample Data Set"
-          class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-          data-test-subj="launchSampleDataSetsample-data-set"
-          type="button"
+          </button>
+        </div>
+        <div
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
-          <span
-            class="emotion-euiButtonDisplayContent"
+          <button
+            aria-label="View Sample Data Set"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+            data-test-subj="launchSampleDataSetsample-data-set"
+            type="button"
           >
             <span
-              class="eui-textTruncate"
+              class="emotion-euiButtonDisplayContent"
             >
-              View data
+              <span
+                class="eui-textTruncate"
+              >
+                View data
+              </span>
             </span>
-          </span>
-        </button>
+          </button>
+        </div>
       </div>
     </div>
   </div>
@@ -217,68 +225,72 @@ exports[`SampleDataCard installed renders without app links 1`] = `
 
 exports[`SampleDataCard not installed renders 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasShadow-euiCard-left-vertical"
+  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasShadow-euiCard-left"
   data-test-subj="sampleDataSetCardsample-data-set"
 >
   <div
-    class="euiCard__top emotion-euiCard__top-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
     <div
-      class="euiCard__image emotion-euiCard__image"
+      class="euiCard__top emotion-euiCard__top-vertical"
     >
-      <img
-        alt=""
-        src="test-file-stub"
-      />
-    </div>
-  </div>
-  <div
-    class="euiCard__content emotion-euiCard__content-vertical"
-  >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-left"
+      <div
+        class="euiCard__image emotion-euiCard__image"
       >
-        Sample Data Set
-      </span>
-    </p>
+        <img
+          alt=""
+          src="test-file-stub"
+        />
+      </div>
+    </div>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        This is a sample data set you can use.
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-left"
+        >
+          Sample Data Set
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          This is a sample data set you can use.
+        </p>
+      </div>
     </div>
-  </div>
-  <div
-    class="emotion-euiCard__footer"
-  >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="emotion-euiCard__footer"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexEnd-stretch-row"
       >
-        <button
-          aria-label="Add Sample Data Set"
-          class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-          data-test-subj="addSampleDataSetsample-data-set"
-          type="button"
+        <div
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
-          <span
-            class="emotion-euiButtonDisplayContent"
+          <button
+            aria-label="Add Sample Data Set"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+            data-test-subj="addSampleDataSetsample-data-set"
+            type="button"
           >
             <span
-              class="eui-textTruncate"
+              class="emotion-euiButtonDisplayContent"
             >
-              Add data
+              <span
+                class="eui-textTruncate"
+              >
+                Add data
+              </span>
             </span>
-          </span>
-        </button>
+          </button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/home/sample_data_card/src/footer/__snapshots__/disabled_footer.test.tsx.snap b/packages/home/sample_data_card/src/footer/__snapshots__/disabled_footer.test.tsx.snap
index 71e0796af88f0..c9493bd852f74 100644
--- a/packages/home/sample_data_card/src/footer/__snapshots__/disabled_footer.test.tsx.snap
+++ b/packages/home/sample_data_card/src/footer/__snapshots__/disabled_footer.test.tsx.snap
@@ -2,17 +2,17 @@
 
 exports[`install footer should render 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexEnd-stretch-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <span
       class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <button
         aria-label="Add Data Set Name"
-        class="euiButton emotion-euiButtonDisplay-m-isDisabled-m-base-disabled"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-isDisabled-m-base-disabled"
         data-test-subj="addSampleDataSetdata-set-id"
         disabled=""
         type="button"
diff --git a/packages/home/sample_data_card/src/footer/__snapshots__/install_footer.test.tsx.snap b/packages/home/sample_data_card/src/footer/__snapshots__/install_footer.test.tsx.snap
index 55f4ad3adb074..ba2aaee1b153b 100644
--- a/packages/home/sample_data_card/src/footer/__snapshots__/install_footer.test.tsx.snap
+++ b/packages/home/sample_data_card/src/footer/__snapshots__/install_footer.test.tsx.snap
@@ -2,14 +2,14 @@
 
 exports[`install footer should render 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexEnd-stretch-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <button
       aria-label="Add Data Set Name"
-      class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+      class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
       data-test-subj="addSampleDataSetdata-set-id"
       type="button"
     >
diff --git a/packages/home/sample_data_card/src/footer/__snapshots__/remove_footer.test.tsx.snap b/packages/home/sample_data_card/src/footer/__snapshots__/remove_footer.test.tsx.snap
index a6ffe99f4304f..cc0416e468c5c 100644
--- a/packages/home/sample_data_card/src/footer/__snapshots__/remove_footer.test.tsx.snap
+++ b/packages/home/sample_data_card/src/footer/__snapshots__/remove_footer.test.tsx.snap
@@ -2,10 +2,10 @@
 
 exports[`install footer should render 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+  class="euiFlexGroup emotion-euiFlexGroup-none-spaceBetween-stretch-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <button
       aria-label="Remove Data Set Name"
@@ -25,11 +25,11 @@ exports[`install footer should render 1`] = `
     </button>
   </div>
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <button
       aria-label="View Data Set Name"
-      class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+      class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
       data-test-subj="launchSampleDataSetdata-set-id"
       type="button"
     >
diff --git a/packages/home/sample_data_card/src/footer/__snapshots__/view_button.test.tsx.snap b/packages/home/sample_data_card/src/footer/__snapshots__/view_button.test.tsx.snap
index 56c8ed1f7959c..c6d1478f2fa58 100644
--- a/packages/home/sample_data_card/src/footer/__snapshots__/view_button.test.tsx.snap
+++ b/packages/home/sample_data_card/src/footer/__snapshots__/view_button.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`should render popover when appLinks is not empty 1`] = `
   >
     <button
       aria-label="View Sample eCommerce orders"
-      class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+      class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
       type="button"
     >
       <span
@@ -43,7 +43,7 @@ exports[`should render popover with ordered appLinks 1`] = `
   >
     <button
       aria-label="View Sample eCommerce orders"
-      class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+      class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
       type="button"
     >
       <span
@@ -67,7 +67,7 @@ exports[`should render popover with ordered appLinks 1`] = `
 exports[`should render simple button when appLinks is empty 1`] = `
 <button
   aria-label="View Sample eCommerce orders"
-  class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+  class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
   data-test-subj="launchSampleDataSetecommerce"
   type="button"
 >
diff --git a/packages/home/sample_data_tab/src/sample_data_cards.tsx b/packages/home/sample_data_tab/src/sample_data_cards.tsx
index 5057c2ea4ae6b..e23702ed2e2d4 100644
--- a/packages/home/sample_data_tab/src/sample_data_cards.tsx
+++ b/packages/home/sample_data_tab/src/sample_data_cards.tsx
@@ -7,8 +7,7 @@
  */
 
 import React from 'react';
-import { EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
-import { FlexGridColumns } from '@elastic/eui/src/components/flex/flex_grid';
+import { EuiFlexGrid, EuiFlexGridProps, EuiFlexItem } from '@elastic/eui';
 import { SampleDataCard } from '@kbn/home-sample-data-card';
 
 import { useList } from './hooks';
@@ -18,7 +17,7 @@ import { useList } from './hooks';
  */
 export interface Props {
   /** Number of columns, defaults to 3. */
-  columns?: FlexGridColumns;
+  columns?: EuiFlexGridProps['columns'];
 }
 
 /**
diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/__snapshots__/comments.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/__snapshots__/comments.test.tsx.snap
index 27df7b34bf313..141ba955b4e27 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/__snapshots__/comments.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/comments/__snapshots__/comments.test.tsx.snap
@@ -67,7 +67,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
         data-test-subj="ExceptionItemCardCommentsContainer"
       >
         <div
@@ -205,7 +205,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
       data-test-subj="ExceptionItemCardCommentsContainer"
     >
       <div
@@ -400,7 +400,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
         data-test-subj="ExceptionItemCardCommentsContainer"
       >
         <div
@@ -538,7 +538,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
       data-test-subj="ExceptionItemCardCommentsContainer"
     >
       <div
diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/__snapshots__/entry_content.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/__snapshots__/entry_content.test.tsx.snap
index 4f35694645fde..bd4792360e0c9 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/__snapshots__/entry_content.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/conditions/entry_content/__snapshots__/entry_content.test.tsx.snap
@@ -12,7 +12,7 @@ Object {
           css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive css-d309m3"
+            class="euiFlexGroup css-d309m3"
             data-test-subj="EntryContentNestedEntry"
           >
             <span
@@ -65,7 +65,7 @@ Object {
         css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive css-d309m3"
+          class="euiFlexGroup css-d309m3"
           data-test-subj="EntryContentNestedEntry"
         >
           <span
diff --git a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/__snapshots__/details_info.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/__snapshots__/details_info.test.tsx.snap
index b1e92f8f4cb20..1f5da047839a2 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/__snapshots__/details_info.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/__snapshots__/details_info.test.tsx.snap
@@ -6,11 +6,11 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-s-flexStart-center-row"
         data-test-subj="MetaInfoDetailsmetaInfoDetails"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class="euiText emotion-EuiText"
@@ -19,7 +19,7 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
           data-test-subj="MetaInfoDetailslastUpdate"
         >
           <span
@@ -41,7 +41,7 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class="euiText emotion-EuiText"
@@ -50,14 +50,14 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
           data-test-subj="MetaInfoDetailslastUpdateValue"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-center-row"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <span
                 class="euiBadge emotion-EuiInnerText"
@@ -81,11 +81,11 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-s-flexStart-center-row"
       data-test-subj="MetaInfoDetailsmetaInfoDetails"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiText emotion-EuiText"
@@ -94,7 +94,7 @@ Object {
         </div>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
         data-test-subj="MetaInfoDetailslastUpdate"
       >
         <span
@@ -116,7 +116,7 @@ Object {
         </span>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiText emotion-EuiText"
@@ -125,14 +125,14 @@ Object {
         </div>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
         data-test-subj="MetaInfoDetailslastUpdateValue"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-center-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <span
               class="euiBadge emotion-EuiInnerText"
@@ -213,11 +213,11 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-s-flexStart-center-row"
         data-test-subj="MetaInfoDetailsmetaInfoDetails"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class="euiText emotion-EuiText"
@@ -226,7 +226,7 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
           data-test-subj="MetaInfoDetailslastUpdate"
         >
           <span
@@ -246,7 +246,7 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class="euiText emotion-EuiText"
@@ -255,14 +255,14 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
           data-test-subj="MetaInfoDetailslastUpdateValue"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-center-row"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <span
                 class="euiBadge emotion-EuiInnerText"
@@ -286,11 +286,11 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-s-flexStart-center-row"
       data-test-subj="MetaInfoDetailsmetaInfoDetails"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiText emotion-EuiText"
@@ -299,7 +299,7 @@ Object {
         </div>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
         data-test-subj="MetaInfoDetailslastUpdate"
       >
         <span
@@ -319,7 +319,7 @@ Object {
         </span>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiText emotion-EuiText"
@@ -328,14 +328,14 @@ Object {
         </div>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
         data-test-subj="MetaInfoDetailslastUpdateValue"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-center-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <span
               class="euiBadge emotion-EuiInnerText"
diff --git a/packages/kbn-securitysolution-exception-list-components/src/generate_linked_rules_menu_item/__snapshots__/generate_linked_rules_menu_item.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/generate_linked_rules_menu_item/__snapshots__/generate_linked_rules_menu_item.test.tsx.snap
index 7c2e71a7ffe93..0fb5d7ae74b18 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/generate_linked_rules_menu_item/__snapshots__/generate_linked_rules_menu_item.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/generate_linked_rules_menu_item/__snapshots__/generate_linked_rules_menu_item.test.tsx.snap
@@ -17,10 +17,10 @@ Object {
             class="euiContextMenuItem__text"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive css-5zp1nn"
+              class="euiFlexGroup css-5zp1nn"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 data-test-subj="generateLinedRulesMenuItemsTestLeftIcon"
               >
                 <span
@@ -59,10 +59,10 @@ Object {
           class="euiContextMenuItem__text"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive css-5zp1nn"
+            class="euiFlexGroup css-5zp1nn"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
               data-test-subj="generateLinedRulesMenuItemsTestLeftIcon"
             >
               <span
@@ -158,7 +158,7 @@ Object {
             class="euiContextMenuItem__text"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive css-5zp1nn"
+              class="euiFlexGroup css-5zp1nn"
             >
               <div
                 class="euiFlexItem emotion-EuiFlexItem"
@@ -192,7 +192,7 @@ Object {
           class="euiContextMenuItem__text"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive css-5zp1nn"
+            class="euiFlexGroup css-5zp1nn"
           >
             <div
               class="euiFlexItem emotion-EuiFlexItem"
diff --git a/packages/kbn-securitysolution-exception-list-components/src/header_menu/__snapshots__/header_menu.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/header_menu/__snapshots__/header_menu.test.tsx.snap
index 584a95a4c1ede..26354d0c0c1c4 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/header_menu/__snapshots__/header_menu.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/header_menu/__snapshots__/header_menu.test.tsx.snap
@@ -6,7 +6,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -116,7 +116,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -202,7 +202,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -231,7 +231,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -317,7 +317,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -352,7 +352,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -444,7 +444,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -479,7 +479,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -571,7 +571,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -607,7 +607,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -700,7 +700,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -735,7 +735,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
     >
       <div
         class="euiPopover emotion-euiPopover"
diff --git a/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
index 8c0a8ba45d404..d734d7db2cfac 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
@@ -47,19 +47,19 @@ Object {
               class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
             />
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+              class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
             >
               <div
-                class="euiFlexItem"
+                class="euiFlexItem emotion-euiFlexItem-grow-1"
               >
                 <h1
                   class="euiTitle emotion-euiTitle-l"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                    class="euiFlexGroup css-nhr7ke"
                   >
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrow10"
+                      class="euiFlexItem emotion-euiFlexItem-grow-10"
                     >
                       <span
                         data-test-subj="TitleText"
@@ -68,7 +68,7 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                      class="euiFlexItem emotion-EuiFlexItem"
                     >
                       <button
                         aria-label="Edit Text List Header"
@@ -97,10 +97,10 @@ Object {
                       css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                        class="euiFlexGroup css-nhr7ke"
                       >
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrow10"
+                          class="euiFlexItem emotion-euiFlexItem-grow-10"
                         >
                           <span
                             css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -110,7 +110,7 @@ Object {
                           </span>
                         </div>
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                          class="euiFlexItem emotion-EuiFlexItem"
                         >
                           <button
                             aria-label="Edit Text List Header"
@@ -148,16 +148,16 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                  class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                       data-test-subj="RightSideMenuItemsContainer"
                     >
                       <div
@@ -171,10 +171,10 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem"
+                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                       >
                         <button
-                          class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+                          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
                           data-test-subj="RightSideMenuItemsManageRulesButton"
                           type="button"
                         >
@@ -190,10 +190,10 @@ Object {
                         </button>
                       </div>
                       <div
-                        class="euiFlexItem"
+                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                         >
                           <div
                             class="euiPopover emotion-euiPopover"
@@ -229,7 +229,7 @@ Object {
       </div>
     </div>
     <div
-      class="euiOverlayMask"
+      class="euiOverlayMask emotion-euiOverlayMask-aboveHeader"
       data-euiportal="true"
       data-relative-to-header="above"
     >
@@ -365,7 +365,7 @@ Object {
               </span>
             </button>
             <button
-              class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
               data-test-subj="editModalSaveBtn"
               form="modalForm_generated-id"
               type="submit"
@@ -428,19 +428,19 @@ Object {
             class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+            class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
-              class="euiFlexItem"
+              class="euiFlexItem emotion-euiFlexItem-grow-1"
             >
               <h1
                 class="euiTitle emotion-euiTitle-l"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                  class="euiFlexGroup css-nhr7ke"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrow10"
+                    class="euiFlexItem emotion-euiFlexItem-grow-10"
                   >
                     <span
                       data-test-subj="TitleText"
@@ -449,7 +449,7 @@ Object {
                     </span>
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                    class="euiFlexItem emotion-EuiFlexItem"
                   >
                     <button
                       aria-label="Edit Text List Header"
@@ -478,10 +478,10 @@ Object {
                     css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                      class="euiFlexGroup css-nhr7ke"
                     >
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrow10"
+                        class="euiFlexItem emotion-euiFlexItem-grow-10"
                       >
                         <span
                           css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -491,7 +491,7 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                        class="euiFlexItem emotion-EuiFlexItem"
                       >
                         <button
                           aria-label="Edit Text List Header"
@@ -529,16 +529,16 @@ Object {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                     data-test-subj="RightSideMenuItemsContainer"
                   >
                     <div
@@ -552,10 +552,10 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <button
-                        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+                        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
                         data-test-subj="RightSideMenuItemsManageRulesButton"
                         type="button"
                       >
@@ -571,10 +571,10 @@ Object {
                       </button>
                     </div>
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                       >
                         <div
                           class="euiPopover emotion-euiPopover"
@@ -710,19 +710,19 @@ Object {
               class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
             />
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+              class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
             >
               <div
-                class="euiFlexItem"
+                class="euiFlexItem emotion-euiFlexItem-grow-1"
               >
                 <h1
                   class="euiTitle emotion-euiTitle-l"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                    class="euiFlexGroup css-nhr7ke"
                   >
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrow10"
+                      class="euiFlexItem emotion-euiFlexItem-grow-10"
                     >
                       <span
                         data-test-subj="TitleText"
@@ -731,7 +731,7 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                      class="euiFlexItem emotion-EuiFlexItem"
                     >
                       <button
                         aria-label="Edit Text List Header"
@@ -760,10 +760,10 @@ Object {
                       css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                        class="euiFlexGroup css-nhr7ke"
                       >
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrow10"
+                          class="euiFlexItem emotion-euiFlexItem-grow-10"
                         >
                           <span
                             css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -773,7 +773,7 @@ Object {
                           </span>
                         </div>
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                          class="euiFlexItem emotion-EuiFlexItem"
                         >
                           <button
                             aria-label="Edit Text List Header"
@@ -811,16 +811,16 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                  class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                       data-test-subj="RightSideMenuItemsContainer"
                     >
                       <div
@@ -834,10 +834,10 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem"
+                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                       >
                         <button
-                          class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+                          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
                           data-test-subj="RightSideMenuItemsManageRulesButton"
                           type="button"
                         >
@@ -853,10 +853,10 @@ Object {
                         </button>
                       </div>
                       <div
-                        class="euiFlexItem"
+                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                         >
                           <div
                             class="euiPopover emotion-euiPopover"
@@ -935,19 +935,19 @@ Object {
             class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+            class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
-              class="euiFlexItem"
+              class="euiFlexItem emotion-euiFlexItem-grow-1"
             >
               <h1
                 class="euiTitle emotion-euiTitle-l"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                  class="euiFlexGroup css-nhr7ke"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrow10"
+                    class="euiFlexItem emotion-euiFlexItem-grow-10"
                   >
                     <span
                       data-test-subj="TitleText"
@@ -956,7 +956,7 @@ Object {
                     </span>
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                    class="euiFlexItem emotion-EuiFlexItem"
                   >
                     <button
                       aria-label="Edit Text List Header"
@@ -985,10 +985,10 @@ Object {
                     css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                      class="euiFlexGroup css-nhr7ke"
                     >
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrow10"
+                        class="euiFlexItem emotion-euiFlexItem-grow-10"
                       >
                         <span
                           css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -998,7 +998,7 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                        class="euiFlexItem emotion-EuiFlexItem"
                       >
                         <button
                           aria-label="Edit Text List Header"
@@ -1036,16 +1036,16 @@ Object {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                     data-test-subj="RightSideMenuItemsContainer"
                   >
                     <div
@@ -1059,10 +1059,10 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <button
-                        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+                        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
                         data-test-subj="RightSideMenuItemsManageRulesButton"
                         type="button"
                       >
@@ -1078,10 +1078,10 @@ Object {
                       </button>
                     </div>
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                       >
                         <div
                           class="euiPopover emotion-euiPopover"
@@ -1217,19 +1217,19 @@ Object {
               class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
             />
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+              class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
             >
               <div
-                class="euiFlexItem"
+                class="euiFlexItem emotion-euiFlexItem-grow-1"
               >
                 <h1
                   class="euiTitle emotion-euiTitle-l"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                    class="euiFlexGroup css-nhr7ke"
                   >
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrow10"
+                      class="euiFlexItem emotion-euiFlexItem-grow-10"
                     >
                       <span
                         data-test-subj="TitleText"
@@ -1238,7 +1238,7 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                      class="euiFlexItem emotion-EuiFlexItem"
                     />
                   </div>
                 </h1>
@@ -1253,10 +1253,10 @@ Object {
                       css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                        class="euiFlexGroup css-nhr7ke"
                       >
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrow10"
+                          class="euiFlexItem emotion-euiFlexItem-grow-10"
                         >
                           <span
                             css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -1266,7 +1266,7 @@ Object {
                           </span>
                         </div>
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                          class="euiFlexItem emotion-EuiFlexItem"
                         />
                       </div>
                       <div
@@ -1290,16 +1290,16 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                  class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                       data-test-subj="RightSideMenuItemsContainer"
                     >
                       <div
@@ -1313,10 +1313,10 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem"
+                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                       >
                         <button
-                          class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+                          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
                           data-test-subj="RightSideMenuItemsManageRulesButton"
                           type="button"
                         >
@@ -1332,10 +1332,10 @@ Object {
                         </button>
                       </div>
                       <div
-                        class="euiFlexItem"
+                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                         >
                           <div
                             class="euiPopover emotion-euiPopover"
@@ -1415,19 +1415,19 @@ Object {
             class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+            class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
-              class="euiFlexItem"
+              class="euiFlexItem emotion-euiFlexItem-grow-1"
             >
               <h1
                 class="euiTitle emotion-euiTitle-l"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                  class="euiFlexGroup css-nhr7ke"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrow10"
+                    class="euiFlexItem emotion-euiFlexItem-grow-10"
                   >
                     <span
                       data-test-subj="TitleText"
@@ -1436,7 +1436,7 @@ Object {
                     </span>
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                    class="euiFlexItem emotion-EuiFlexItem"
                   />
                 </div>
               </h1>
@@ -1451,10 +1451,10 @@ Object {
                     css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                      class="euiFlexGroup css-nhr7ke"
                     >
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrow10"
+                        class="euiFlexItem emotion-euiFlexItem-grow-10"
                       >
                         <span
                           css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -1464,7 +1464,7 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                        class="euiFlexItem emotion-EuiFlexItem"
                       />
                     </div>
                     <div
@@ -1488,16 +1488,16 @@ Object {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                     data-test-subj="RightSideMenuItemsContainer"
                   >
                     <div
@@ -1511,10 +1511,10 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <button
-                        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+                        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
                         data-test-subj="RightSideMenuItemsManageRulesButton"
                         type="button"
                       >
@@ -1530,10 +1530,10 @@ Object {
                       </button>
                     </div>
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                       >
                         <div
                           class="euiPopover emotion-euiPopover"
@@ -1670,19 +1670,19 @@ Object {
               class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
             />
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+              class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
             >
               <div
-                class="euiFlexItem"
+                class="euiFlexItem emotion-euiFlexItem-grow-1"
               >
                 <h1
                   class="euiTitle emotion-euiTitle-l"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                    class="euiFlexGroup css-nhr7ke"
                   >
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrow10"
+                      class="euiFlexItem emotion-euiFlexItem-grow-10"
                     >
                       <span
                         data-test-subj="TitleText"
@@ -1691,7 +1691,7 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                      class="euiFlexItem emotion-EuiFlexItem"
                     />
                   </div>
                 </h1>
@@ -1706,10 +1706,10 @@ Object {
                       css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                        class="euiFlexGroup css-nhr7ke"
                       >
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrow10"
+                          class="euiFlexItem emotion-euiFlexItem-grow-10"
                         >
                           <span
                             css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -1719,7 +1719,7 @@ Object {
                           </span>
                         </div>
                         <div
-                          class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                          class="euiFlexItem emotion-EuiFlexItem"
                         />
                       </div>
                       <div
@@ -1743,16 +1743,16 @@ Object {
                 </div>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                  class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                       data-test-subj="RightSideMenuItemsContainer"
                     >
                       <div
@@ -1766,10 +1766,10 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem"
+                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                         >
                           <div
                             class="euiPopover emotion-euiPopover"
@@ -1929,19 +1929,19 @@ Object {
             class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+            class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
-              class="euiFlexItem"
+              class="euiFlexItem emotion-euiFlexItem-grow-1"
             >
               <h1
                 class="euiTitle emotion-euiTitle-l"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                  class="euiFlexGroup css-nhr7ke"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrow10"
+                    class="euiFlexItem emotion-euiFlexItem-grow-10"
                   >
                     <span
                       data-test-subj="TitleText"
@@ -1950,7 +1950,7 @@ Object {
                     </span>
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                    class="euiFlexItem emotion-EuiFlexItem"
                   />
                 </div>
               </h1>
@@ -1965,10 +1965,10 @@ Object {
                     css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+                      class="euiFlexGroup css-nhr7ke"
                     >
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrow10"
+                        class="euiFlexItem emotion-euiFlexItem-grow-10"
                       >
                         <span
                           css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
@@ -1978,7 +1978,7 @@ Object {
                         </span>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+                        class="euiFlexItem emotion-EuiFlexItem"
                       />
                     </div>
                     <div
@@ -2002,16 +2002,16 @@ Object {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
                     data-test-subj="RightSideMenuItemsContainer"
                   >
                     <div
@@ -2025,10 +2025,10 @@ Object {
                       </span>
                     </div>
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <div
-                        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+                        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
                       >
                         <div
                           class="euiPopover emotion-euiPopover"
diff --git a/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
index 398adc0a3b02e..74a4924e1a9f1 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
@@ -6,7 +6,7 @@ Object {
   "baseElement": <body>
     <div />
     <div
-      class="euiOverlayMask"
+      class="euiOverlayMask emotion-euiOverlayMask-aboveHeader"
       data-euiportal="true"
       data-relative-to-header="above"
     >
@@ -142,7 +142,7 @@ Object {
               </span>
             </button>
             <button
-              class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
               data-test-subj="editModalSaveBtn"
               form="modalForm_generated-id"
               type="submit"
diff --git a/packages/kbn-securitysolution-exception-list-components/src/list_header/menu_items/__snapshots__/menu_items.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/list_header/menu_items/__snapshots__/menu_items.test.tsx.snap
index 0dc8f79ac2d5d..24f086b897db4 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/list_header/menu_items/__snapshots__/menu_items.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/list_header/menu_items/__snapshots__/menu_items.test.tsx.snap
@@ -6,14 +6,14 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
         data-test-subj="Container"
       >
         <div
           class="euiFlexItem emotion-EuiFlexItem"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -48,10 +48,10 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -82,14 +82,14 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
       data-test-subj="Container"
     >
       <div
         class="euiFlexItem emotion-EuiFlexItem"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -124,10 +124,10 @@ Object {
         </div>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -215,7 +215,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
         data-test-subj="Container"
       >
         <div
@@ -229,10 +229,10 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="ManageRulesButton"
             type="button"
           >
@@ -248,10 +248,10 @@ Object {
           </button>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -282,7 +282,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
       data-test-subj="Container"
     >
       <div
@@ -296,10 +296,10 @@ Object {
         </span>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <button
-          class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
           data-test-subj="ManageRulesButton"
           type="button"
         >
@@ -315,10 +315,10 @@ Object {
         </button>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -406,7 +406,7 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
         data-test-subj="Container"
       >
         <div
@@ -420,10 +420,10 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="ManageRulesButton"
             type="button"
           >
@@ -439,10 +439,10 @@ Object {
           </button>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -553,7 +553,7 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
       data-test-subj="Container"
     >
       <div
@@ -567,10 +567,10 @@ Object {
         </span>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <button
-          class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
           data-test-subj="ManageRulesButton"
           type="button"
         >
@@ -586,10 +586,10 @@ Object {
         </button>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -677,14 +677,14 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
         data-test-subj="Container"
       >
         <div
           class="euiFlexItem emotion-EuiFlexItem"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -719,10 +719,10 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -834,14 +834,14 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
       data-test-subj="Container"
     >
       <div
         class="euiFlexItem emotion-EuiFlexItem"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -876,10 +876,10 @@ Object {
         </div>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -967,14 +967,14 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
         data-test-subj="Container"
       >
         <div
           class="euiFlexItem emotion-EuiFlexItem"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -1009,10 +1009,10 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="ManageRulesButton"
             type="button"
           >
@@ -1028,10 +1028,10 @@ Object {
           </button>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
               class="euiPopover emotion-euiPopover"
@@ -1062,14 +1062,14 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-baseline-row"
       data-test-subj="Container"
     >
       <div
         class="euiFlexItem emotion-EuiFlexItem"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -1104,10 +1104,10 @@ Object {
         </div>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <button
-          class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
           data-test-subj="ManageRulesButton"
           type="button"
         >
@@ -1123,10 +1123,10 @@ Object {
         </button>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
             class="euiPopover emotion-euiPopover"
diff --git a/packages/kbn-securitysolution-exception-list-components/src/text_with_edit/__snapshots__/text_with_edit.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/text_with_edit/__snapshots__/text_with_edit.test.tsx.snap
index 31fe94528eda5..3ef439974a498 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/text_with_edit/__snapshots__/text_with_edit.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/text_with_edit/__snapshots__/text_with_edit.test.tsx.snap
@@ -6,10 +6,10 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+        class="euiFlexGroup css-nhr7ke"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrow10"
+          class="euiFlexItem emotion-euiFlexItem-grow-10"
         >
           <span
             data-test-subj="TextWithEditTestText"
@@ -18,17 +18,17 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+          class="euiFlexItem emotion-EuiFlexItem"
         />
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+      class="euiFlexGroup css-nhr7ke"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrow10"
+        class="euiFlexItem emotion-euiFlexItem-grow-10"
       >
         <span
           data-test-subj="TextWithEditTestText"
@@ -37,7 +37,7 @@ Object {
         </span>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+        class="euiFlexItem emotion-EuiFlexItem"
       />
     </div>
   </div>,
@@ -101,10 +101,10 @@ Object {
   "baseElement": <body>
     <div>
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+        class="euiFlexGroup css-nhr7ke"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrow10"
+          class="euiFlexItem emotion-euiFlexItem-grow-10"
         >
           <span
             data-test-subj="TextWithEditTestText"
@@ -113,7 +113,7 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+          class="euiFlexItem emotion-EuiFlexItem"
         >
           <button
             aria-label="Edit Text List Header"
@@ -134,10 +134,10 @@ Object {
   </body>,
   "container": <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive css-nhr7ke"
+      class="euiFlexGroup css-nhr7ke"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrow10"
+        class="euiFlexItem emotion-euiFlexItem-grow-10"
       >
         <span
           data-test-subj="TextWithEditTestText"
@@ -146,7 +146,7 @@ Object {
         </span>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero emotion-EuiFlexItem"
+        class="euiFlexItem emotion-EuiFlexItem"
       >
         <button
           aria-label="Edit Text List Header"
diff --git a/packages/shared-ux/button/exit_full_screen/impl/src/__snapshots__/exit_full_screen_button.test.tsx.snap b/packages/shared-ux/button/exit_full_screen/impl/src/__snapshots__/exit_full_screen_button.test.tsx.snap
index af5dd18c20e8a..c3dbe9dc42bfc 100644
--- a/packages/shared-ux/button/exit_full_screen/impl/src/__snapshots__/exit_full_screen_button.test.tsx.snap
+++ b/packages/shared-ux/button/exit_full_screen/impl/src/__snapshots__/exit_full_screen_button.test.tsx.snap
@@ -1,407 +1,83 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<ExitFullScreenButton /> with kibana services is rendered 1`] = `
-<ExitFullScreenButtonKibanaProvider
-  coreStart={
-    Object {
-      "chrome": Object {
-        "setIsVisible": [MockFunction] {
-          "calls": Array [
-            Array [
-              false,
-            ],
-          ],
-          "results": Array [
-            Object {
-              "type": "return",
-              "value": undefined,
-            },
-          ],
-        },
-      },
-    }
-  }
->
-  <ExitFullScreenButton
-    onExit={[MockFunction]}
+<div>
+  <p
+    aria-live="polite"
+    class="emotion-euiScreenReaderOnly"
   >
-    <ExitFullScreenButton
-      css={
-        Object {
-          "map": undefined,
-          "name": "knjqgf",
-          "next": undefined,
-          "styles": "
-    bottom: 8px;
-    left: 8px;
-    position: fixed;
-    z-index: 5;
-  ",
-          "toString": [Function],
-        }
-      }
-      onClick={[Function]}
+    In full screen mode, press ESC to exit.
+  </p>
+  <button
+    class="exitFullScreenButton"
+    css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
+    data-test-subj="exitFullScreenModeButton"
+  >
+    <span
+      class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
     >
-      <div>
-        <EuiScreenReaderOnly>
-          <p
-            aria-live="polite"
-            css="unknown styles"
-            key="null"
-          >
-            <Insertion
-              cache={
-                Object {
-                  "insert": [Function],
-                  "inserted": Object {
-                    "hus3oj-euiScreenReaderOnly": true,
-                  },
-                  "key": "css",
-                  "nonce": undefined,
-                  "registered": Object {},
-                  "sheet": StyleSheet {
-                    "_alreadyInsertedOrderInsensitiveRule": true,
-                    "_insertTag": [Function],
-                    "before": null,
-                    "container": <head>
-                      <style
-                        data-emotion="css"
-                        data-s=""
-                      >
-                        
-                        .emotion-euiScreenReaderOnly{position:absolute;inset-block-start:auto;inset-inline-start:-10000px;inline-size:1px;block-size:1px;clip:rect(0 0 0 0);-webkit-clip-path:inset(50%);clip-path:inset(50%);overflow:hidden;margin:-1px;}
-                      </style>
-                      <style
-                        data-styled="active"
-                        data-styled-version="5.1.0"
-                      />
-                      <style
-                        data-styled="active"
-                        data-styled-version="5.1.0"
-                      />
-                    </head>,
-                    "ctr": 1,
-                    "insertionPoint": undefined,
-                    "isSpeedy": false,
-                    "key": "css",
-                    "nonce": undefined,
-                    "prepend": undefined,
-                    "tags": Array [
-                      <style
-                        data-emotion="css"
-                        data-s=""
-                      >
-                        
-                        .emotion-euiScreenReaderOnly{position:absolute;inset-block-start:auto;inset-inline-start:-10000px;inline-size:1px;block-size:1px;clip:rect(0 0 0 0);-webkit-clip-path:inset(50%);clip-path:inset(50%);overflow:hidden;margin:-1px;}
-                      </style>,
-                    ],
-                  },
-                }
-              }
-              isStringTag={true}
-              serialized={
-                Object {
-                  "map": undefined,
-                  "name": "hus3oj-euiScreenReaderOnly",
-                  "next": undefined,
-                  "styles": ";
-  // Take the element out of the layout
-  position: absolute;
-  // Keep it vertically inline
-  inset-block-start: auto;
-  // Chrome requires a left value, and Selenium (used by Kibana's FTR) requires an off-screen position for its .getVisibleText() to not register SR-only text
-  inset-inline-start: -10000px;
-  // The element must have a size (for some screen readers)
-  
-    inline-size: 1px;
-    block-size: 1px;
-  
-  // But reduce the visible size to nothing
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  // And ensure no overflows occur
-  overflow: hidden;
-  // Chrome requires the negative margin to not cause overflows of parent containers
-  margin: -1px;
-;label:euiScreenReaderOnly;;;;",
-                  "toString": [Function],
-                }
-              }
-            />
-            <p
-              aria-live="polite"
-              className="emotion-euiScreenReaderOnly"
-            >
-              In full screen mode, press ESC to exit.
-            </p>
-          </p>
-        </EuiScreenReaderOnly>
-        <button
-          className="exitFullScreenButton"
-          data-test-subj="exitFullScreenModeButton"
-          onClick={[Function]}
-        >
-          <EuiFlexGroup
-            alignItems="center"
-            component="span"
-            gutterSize="s"
-            responsive={false}
-          >
-            <span
-              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-            >
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="m"
-                    type="logoElastic"
-                  >
-                    <span
-                      data-euiicon-type="logoElastic"
-                      size="m"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                data-test-subj="exitFullScreenModeText"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                  data-test-subj="exitFullScreenModeText"
-                >
-                  Exit full screen
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="s"
-                    type="fullScreenExit"
-                  >
-                    <span
-                      data-euiicon-type="fullScreenExit"
-                      size="s"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-            </span>
-          </EuiFlexGroup>
-        </button>
-      </div>
-    </ExitFullScreenButton>
-  </ExitFullScreenButton>
-</ExitFullScreenButtonKibanaProvider>
+      <span
+        class="euiFlexItem emotion-euiFlexItem-growZero"
+      >
+        <span
+          data-euiicon-type="logoElastic"
+        />
+      </span>
+      <span
+        class="euiFlexItem emotion-euiFlexItem-growZero"
+        data-test-subj="exitFullScreenModeText"
+      >
+        Exit full screen
+      </span>
+      <span
+        class="euiFlexItem emotion-euiFlexItem-growZero"
+      >
+        <span
+          data-euiicon-type="fullScreenExit"
+        />
+      </span>
+    </span>
+  </button>
+</div>
 `;
 
 exports[`<ExitFullScreenButton /> with manual services is rendered 1`] = `
-<ExitFullScreenButtonProvider
-  setIsFullscreen={
-    [MockFunction] {
-      "calls": Array [
-        Array [
-          true,
-        ],
-      ],
-      "results": Array [
-        Object {
-          "type": "return",
-          "value": undefined,
-        },
-      ],
-    }
-  }
->
-  <ExitFullScreenButton
-    onExit={[MockFunction]}
+<div>
+  <p
+    aria-live="polite"
+    class="emotion-euiScreenReaderOnly"
+  >
+    In full screen mode, press ESC to exit.
+  </p>
+  <button
+    class="exitFullScreenButton"
+    css="You have tried to stringify object returned from \`css\` function. It isn't supposed to be used directly (e.g. as value of the \`className\` prop), but rather handed to emotion so it can handle it (e.g. as value of \`css\` prop)."
+    data-test-subj="exitFullScreenModeButton"
   >
-    <ExitFullScreenButton
-      css={
-        Object {
-          "map": undefined,
-          "name": "knjqgf",
-          "next": undefined,
-          "styles": "
-    bottom: 8px;
-    left: 8px;
-    position: fixed;
-    z-index: 5;
-  ",
-          "toString": [Function],
-        }
-      }
-      onClick={[Function]}
+    <span
+      class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
     >
-      <div>
-        <EuiScreenReaderOnly>
-          <p
-            aria-live="polite"
-            css="unknown styles"
-            key="null"
-          >
-            <Insertion
-              cache={
-                Object {
-                  "insert": [Function],
-                  "inserted": Object {
-                    "hus3oj-euiScreenReaderOnly": true,
-                  },
-                  "key": "css",
-                  "nonce": undefined,
-                  "registered": Object {},
-                  "sheet": StyleSheet {
-                    "_alreadyInsertedOrderInsensitiveRule": true,
-                    "_insertTag": [Function],
-                    "before": null,
-                    "container": <head>
-                      <style
-                        data-emotion="css"
-                        data-s=""
-                      >
-                        
-                        .emotion-euiScreenReaderOnly{position:absolute;inset-block-start:auto;inset-inline-start:-10000px;inline-size:1px;block-size:1px;clip:rect(0 0 0 0);-webkit-clip-path:inset(50%);clip-path:inset(50%);overflow:hidden;margin:-1px;}
-                      </style>
-                      <style
-                        data-styled="active"
-                        data-styled-version="5.1.0"
-                      />
-                    </head>,
-                    "ctr": 1,
-                    "insertionPoint": undefined,
-                    "isSpeedy": false,
-                    "key": "css",
-                    "nonce": undefined,
-                    "prepend": undefined,
-                    "tags": Array [
-                      <style
-                        data-emotion="css"
-                        data-s=""
-                      >
-                        
-                        .emotion-euiScreenReaderOnly{position:absolute;inset-block-start:auto;inset-inline-start:-10000px;inline-size:1px;block-size:1px;clip:rect(0 0 0 0);-webkit-clip-path:inset(50%);clip-path:inset(50%);overflow:hidden;margin:-1px;}
-                      </style>,
-                    ],
-                  },
-                }
-              }
-              isStringTag={true}
-              serialized={
-                Object {
-                  "map": undefined,
-                  "name": "hus3oj-euiScreenReaderOnly",
-                  "next": undefined,
-                  "styles": ";
-  // Take the element out of the layout
-  position: absolute;
-  // Keep it vertically inline
-  inset-block-start: auto;
-  // Chrome requires a left value, and Selenium (used by Kibana's FTR) requires an off-screen position for its .getVisibleText() to not register SR-only text
-  inset-inline-start: -10000px;
-  // The element must have a size (for some screen readers)
-  
-    inline-size: 1px;
-    block-size: 1px;
-  
-  // But reduce the visible size to nothing
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  // And ensure no overflows occur
-  overflow: hidden;
-  // Chrome requires the negative margin to not cause overflows of parent containers
-  margin: -1px;
-;label:euiScreenReaderOnly;;;;",
-                  "toString": [Function],
-                }
-              }
-            />
-            <p
-              aria-live="polite"
-              className="emotion-euiScreenReaderOnly"
-            >
-              In full screen mode, press ESC to exit.
-            </p>
-          </p>
-        </EuiScreenReaderOnly>
-        <button
-          className="exitFullScreenButton"
-          data-test-subj="exitFullScreenModeButton"
-          onClick={[Function]}
-        >
-          <EuiFlexGroup
-            alignItems="center"
-            component="span"
-            gutterSize="s"
-            responsive={false}
-          >
-            <span
-              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-            >
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="m"
-                    type="logoElastic"
-                  >
-                    <span
-                      data-euiicon-type="logoElastic"
-                      size="m"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                data-test-subj="exitFullScreenModeText"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                  data-test-subj="exitFullScreenModeText"
-                >
-                  Exit full screen
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="s"
-                    type="fullScreenExit"
-                  >
-                    <span
-                      data-euiicon-type="fullScreenExit"
-                      size="s"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-            </span>
-          </EuiFlexGroup>
-        </button>
-      </div>
-    </ExitFullScreenButton>
-  </ExitFullScreenButton>
-</ExitFullScreenButtonProvider>
+      <span
+        class="euiFlexItem emotion-euiFlexItem-growZero"
+      >
+        <span
+          data-euiicon-type="logoElastic"
+        />
+      </span>
+      <span
+        class="euiFlexItem emotion-euiFlexItem-growZero"
+        data-test-subj="exitFullScreenModeText"
+      >
+        Exit full screen
+      </span>
+      <span
+        class="euiFlexItem emotion-euiFlexItem-growZero"
+      >
+        <span
+          data-euiicon-type="fullScreenExit"
+        />
+      </span>
+    </span>
+  </button>
+</div>
 `;
diff --git a/packages/shared-ux/button/exit_full_screen/impl/src/exit_full_screen_button.test.tsx b/packages/shared-ux/button/exit_full_screen/impl/src/exit_full_screen_button.test.tsx
index 00b08f8ebc535..1d2bf1d9aaa58 100644
--- a/packages/shared-ux/button/exit_full_screen/impl/src/exit_full_screen_button.test.tsx
+++ b/packages/shared-ux/button/exit_full_screen/impl/src/exit_full_screen_button.test.tsx
@@ -41,7 +41,7 @@ describe('<ExitFullScreenButton />', () => {
   describe('with manual services', () => {
     test('is rendered', () => {
       const component = componentMount(<ExitFullScreenButton onExit={jest.fn()} />);
-      expect(component).toMatchSnapshot();
+      expect(component.render()).toMatchSnapshot();
     });
 
     test('passing `false` to toggleChrome does not toggle chrome', () => {
@@ -90,7 +90,7 @@ describe('<ExitFullScreenButton />', () => {
   describe('with kibana services', () => {
     test('is rendered', () => {
       const component = kibanaMount(<ExitFullScreenButton onExit={jest.fn()} />);
-      expect(component).toMatchSnapshot();
+      expect(component.render()).toMatchSnapshot();
     });
 
     test('passing `false` to toggleChrome does not toggle chrome', () => {
diff --git a/packages/shared-ux/button_toolbar/src/buttons/add_from_library/__snapshots__/add_from_library.test.tsx.snap b/packages/shared-ux/button_toolbar/src/buttons/add_from_library/__snapshots__/add_from_library.test.tsx.snap
index 69d60bc1592b4..46ed9f7f6f769 100644
--- a/packages/shared-ux/button_toolbar/src/buttons/add_from_library/__snapshots__/add_from_library.test.tsx.snap
+++ b/packages/shared-ux/button_toolbar/src/buttons/add_from_library/__snapshots__/add_from_library.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`<ToolbarButton /> is rendered 1`] = `
 <button
-  class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+  class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
   intl="[object Object]"
   type="button"
 >
diff --git a/packages/shared-ux/button_toolbar/src/buttons/primary/__snapshots__/primary.test.tsx.snap b/packages/shared-ux/button_toolbar/src/buttons/primary/__snapshots__/primary.test.tsx.snap
index e721b91c10f81..12d4e94ce4e6b 100644
--- a/packages/shared-ux/button_toolbar/src/buttons/primary/__snapshots__/primary.test.tsx.snap
+++ b/packages/shared-ux/button_toolbar/src/buttons/primary/__snapshots__/primary.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`<ToolbarButton /> is rendered 1`] = `
 <button
-  class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+  class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
   intl="[object Object]"
   type="button"
 >
diff --git a/packages/shared-ux/button_toolbar/src/popover/__snapshots__/popover.test.tsx.snap b/packages/shared-ux/button_toolbar/src/popover/__snapshots__/popover.test.tsx.snap
index dd63af4b39fac..6129d515e3a7f 100644
--- a/packages/shared-ux/button_toolbar/src/popover/__snapshots__/popover.test.tsx.snap
+++ b/packages/shared-ux/button_toolbar/src/popover/__snapshots__/popover.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`<ToolbarPopover /> is rendered 1`] = `
     class="euiPopover__anchor css-16vtueo-render"
   >
     <button
-      class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+      class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
       type="button"
     >
       <span
diff --git a/packages/shared-ux/button_toolbar/src/toolbar/__snapshots__/toolbar.test.tsx.snap b/packages/shared-ux/button_toolbar/src/toolbar/__snapshots__/toolbar.test.tsx.snap
index 3b2a867821d2f..aeeaf1fb195fd 100644
--- a/packages/shared-ux/button_toolbar/src/toolbar/__snapshots__/toolbar.test.tsx.snap
+++ b/packages/shared-ux/button_toolbar/src/toolbar/__snapshots__/toolbar.test.tsx.snap
@@ -2,13 +2,13 @@
 
 exports[`<Toolbar /> is rendered 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <button
-      class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+      class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
       type="button"
     >
       <span
@@ -23,10 +23,10 @@ exports[`<Toolbar /> is rendered 1`] = `
     </button>
   </div>
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--wrap"
+      class="euiFlexGroup emotion-euiFlexGroup-wrap-xs-flexStart-center-row"
     />
   </div>
 </div>
diff --git a/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.test.tsx.snap b/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.test.tsx.snap
index e14964de4ff97..6bfc8a1b4256a 100644
--- a/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.test.tsx.snap
+++ b/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.test.tsx.snap
@@ -8,69 +8,73 @@ exports[`NoDataCard props button 1`] = `
     class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-isClickable-EuiCard"
   >
     <div
-      class="euiCard__top emotion-euiCard__top-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
       <div
-        class="euiCard__image emotion-euiCard__image"
+        class="euiCard__top emotion-euiCard__top-vertical"
       >
-        <figure
-          class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+        <div
+          class="euiCard__image emotion-euiCard__image"
         >
-          <img
-            alt=""
-            class="euiImage emotion-euiImage-fullWidth"
-            src="test-file-stub"
-            style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
-          />
-        </figure>
+          <figure
+            class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+          >
+            <img
+              alt=""
+              class="euiImage emotion-euiImage-fullWidth"
+              src="test-file-stub"
+              style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
+            />
+          </figure>
+        </div>
       </div>
-    </div>
-    <div
-      class="euiCard__content emotion-euiCard__content-vertical"
-    >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
+      <div
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <a
-          aria-describedby="generated-idDescription"
-          class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
-          href="/app/integrations/browse"
-          rel="noreferrer"
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
         >
-          <span
-            class="emotion-euiScreenReaderOnly"
+          <a
+            aria-describedby="generated-idDescription"
+            class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
+            href="/app/integrations/browse"
+            rel="noreferrer"
           >
-            Card title
-          </span>
-        </a>
-      </p>
-      <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
-      >
-        <p>
-          Description
+            <span
+              class="emotion-euiScreenReaderOnly"
+            >
+              Card title
+            </span>
+          </a>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            Description
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
+          type="button"
         >
           <span
-            class="eui-textTruncate"
+            class="emotion-euiButtonDisplayContent"
           >
-            Button
+            <span
+              class="eui-textTruncate"
+            >
+              Button
+            </span>
           </span>
-        </span>
-      </button>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -84,69 +88,73 @@ exports[`NoDataCard props extends EuiCardProps 1`] = `
     class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard custom_class emotion-euiPanel-grow-m-l-plain-hasShadow-isClickable-EuiCard"
   >
     <div
-      class="euiCard__top emotion-euiCard__top-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
       <div
-        class="euiCard__image emotion-euiCard__image"
+        class="euiCard__top emotion-euiCard__top-vertical"
       >
-        <figure
-          class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+        <div
+          class="euiCard__image emotion-euiCard__image"
         >
-          <img
-            alt=""
-            class="euiImage emotion-euiImage-fullWidth"
-            src="test-file-stub"
-            style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
-          />
-        </figure>
+          <figure
+            class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+          >
+            <img
+              alt=""
+              class="euiImage emotion-euiImage-fullWidth"
+              src="test-file-stub"
+              style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
+            />
+          </figure>
+        </div>
       </div>
-    </div>
-    <div
-      class="euiCard__content emotion-euiCard__content-vertical"
-    >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
+      <div
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <a
-          aria-describedby="generated-idDescription"
-          class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
-          href="/app/integrations/browse"
-          rel="noreferrer"
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
         >
-          <span
-            class="emotion-euiScreenReaderOnly"
+          <a
+            aria-describedby="generated-idDescription"
+            class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
+            href="/app/integrations/browse"
+            rel="noreferrer"
           >
-            Card title
-          </span>
-        </a>
-      </p>
-      <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
-      >
-        <p>
-          Description
+            <span
+              class="emotion-euiScreenReaderOnly"
+            >
+              Card title
+            </span>
+          </a>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            Description
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
+          type="button"
         >
           <span
-            class="eui-textTruncate"
+            class="emotion-euiButtonDisplayContent"
           >
-            Button
+            <span
+              class="eui-textTruncate"
+            >
+              Button
+            </span>
           </span>
-        </span>
-      </button>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -160,69 +168,73 @@ exports[`NoDataCard props href 1`] = `
     class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-isClickable-EuiCard"
   >
     <div
-      class="euiCard__top emotion-euiCard__top-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
       <div
-        class="euiCard__image emotion-euiCard__image"
+        class="euiCard__top emotion-euiCard__top-vertical"
       >
-        <figure
-          class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+        <div
+          class="euiCard__image emotion-euiCard__image"
         >
-          <img
-            alt=""
-            class="euiImage emotion-euiImage-fullWidth"
-            src="test-file-stub"
-            style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
-          />
-        </figure>
+          <figure
+            class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+          >
+            <img
+              alt=""
+              class="euiImage emotion-euiImage-fullWidth"
+              src="test-file-stub"
+              style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
+            />
+          </figure>
+        </div>
       </div>
-    </div>
-    <div
-      class="euiCard__content emotion-euiCard__content-vertical"
-    >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
+      <div
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <a
-          aria-describedby="generated-idDescription"
-          class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
-          href="#"
-          rel="noreferrer"
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
         >
-          <span
-            class="emotion-euiScreenReaderOnly"
+          <a
+            aria-describedby="generated-idDescription"
+            class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
+            href="#"
+            rel="noreferrer"
           >
-            Card title
-          </span>
-        </a>
-      </p>
-      <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
-      >
-        <p>
-          Description
+            <span
+              class="emotion-euiScreenReaderOnly"
+            >
+              Card title
+            </span>
+          </a>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            Description
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
+          type="button"
         >
           <span
-            class="eui-textTruncate"
+            class="emotion-euiButtonDisplayContent"
           >
-            Button
+            <span
+              class="eui-textTruncate"
+            >
+              Button
+            </span>
           </span>
-        </span>
-      </button>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -236,53 +248,57 @@ exports[`NoDataCard props no access to Fleet 1`] = `
     class="euiPanel euiPanel--subdued euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-subdued-EuiCard"
   >
     <div
-      class="euiCard__top emotion-euiCard__top-vertical-disabled"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
       <div
-        class="euiCard__image emotion-euiCard__image"
+        class="euiCard__top emotion-euiCard__top-vertical-disabled"
       >
-        <figure
-          class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+        <div
+          class="euiCard__image emotion-euiCard__image"
         >
-          <img
-            alt=""
-            class="euiImage emotion-euiImage-fullWidth"
-            src="test-file-stub"
-            style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
-          />
-        </figure>
-      </div>
-    </div>
-    <div
-      class="euiCard__content emotion-euiCard__content-vertical"
-    >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <button
-          aria-describedby=" generated-idDescription"
-          class="euiCard__titleButton emotion-euiCard__text-center-disabled"
-          disabled=""
-        >
-          <span
-            class="emotion-euiTextColor-default"
+          <figure
+            class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
           >
-            Contact your administrator
-          </span>
-        </button>
-      </p>
+            <img
+              alt=""
+              class="euiImage emotion-euiImage-fullWidth"
+              src="test-file-stub"
+              style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
+            />
+          </figure>
+        </div>
+      </div>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span
-            class="emotion-euiTextColor-default"
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <button
+            aria-describedby=" generated-idDescription"
+            class="euiCard__titleButton emotion-euiCard__text-center-disabled"
+            disabled=""
           >
-            This integration is not yet enabled. Your administrator has the required permissions to turn it on.
-          </span>
+            <span
+              class="emotion-euiTextColor-default"
+            >
+              Contact your administrator
+            </span>
+          </button>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span
+              class="emotion-euiTextColor-default"
+            >
+              This integration is not yet enabled. Your administrator has the required permissions to turn it on.
+            </span>
+          </p>
+        </div>
       </div>
     </div>
   </div>
@@ -297,69 +313,73 @@ exports[`NoDataCard renders 1`] = `
     class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-isClickable-EuiCard"
   >
     <div
-      class="euiCard__top emotion-euiCard__top-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
       <div
-        class="euiCard__image emotion-euiCard__image"
+        class="euiCard__top emotion-euiCard__top-vertical"
       >
-        <figure
-          class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+        <div
+          class="euiCard__image emotion-euiCard__image"
         >
-          <img
-            alt=""
-            class="euiImage emotion-euiImage-fullWidth"
-            src="test-file-stub"
-            style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
-          />
-        </figure>
+          <figure
+            class="euiImageWrapper emotion-euiImageWrapper-fullWidth"
+          >
+            <img
+              alt=""
+              class="euiImage emotion-euiImage-fullWidth"
+              src="test-file-stub"
+              style="width:max(100%, 360px);height:240px;object-fit:cover;background:aliceblue"
+            />
+          </figure>
+        </div>
       </div>
-    </div>
-    <div
-      class="euiCard__content emotion-euiCard__content-vertical"
-    >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
+      <div
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <a
-          aria-describedby="generated-idDescription"
-          class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
-          href="/app/integrations/browse"
-          rel="noreferrer"
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
         >
-          <span
-            class="emotion-euiScreenReaderOnly"
+          <a
+            aria-describedby="generated-idDescription"
+            class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
+            href="/app/integrations/browse"
+            rel="noreferrer"
           >
-            Card title
-          </span>
-        </a>
-      </p>
-      <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
-      >
-        <p>
-          Description
+            <span
+              class="emotion-euiScreenReaderOnly"
+            >
+              Card title
+            </span>
+          </a>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            Description
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
+          type="button"
         >
           <span
-            class="eui-textTruncate"
+            class="emotion-euiButtonDisplayContent"
           >
-            Card title
+            <span
+              class="eui-textTruncate"
+            >
+              Card title
+            </span>
           </span>
-        </span>
-      </button>
+        </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template.test.tsx.snap b/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template.test.tsx.snap
index 2932ceff41cc7..e70577abec7a4 100644
--- a/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template.test.tsx.snap
+++ b/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template.test.tsx.snap
@@ -18,10 +18,10 @@ exports[`KibanaPageTemplate render basic template 1`] = `
         style="max-width:1200px"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+          class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem"
+            class="euiFlexItem emotion-euiFlexItem-grow-1"
           >
             <div
               class="euiText emotion-euiText-constrainedWidth-m"
@@ -32,13 +32,13 @@ exports[`KibanaPageTemplate render basic template 1`] = `
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+              class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 test
               </div>
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 2566c69a38796..eaa968f3c94e8 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -84,6 +84,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@8.3.3': ['Elastic License 2.0'],
-  '@elastic/eui@67.1.8': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@70.2.4': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
index 37496a88240c7..9aeb0d10093ba 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -246,7 +246,7 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
 
     return (
       <div>
-        <EuiFlexGroup gutterSize="none">
+        <EuiFlexGroup>
           <EuiFlexItem>
             <PageTitle />
           </EuiFlexItem>
diff --git a/src/plugins/dashboard/public/application/top_nav/__snapshots__/save_modal.test.js.snap b/src/plugins/dashboard/public/application/top_nav/__snapshots__/save_modal.test.js.snap
index f8ba1b3868527..dbf3cb7ab8241 100644
--- a/src/plugins/dashboard/public/application/top_nav/__snapshots__/save_modal.test.js.snap
+++ b/src/plugins/dashboard/public/application/top_nav/__snapshots__/save_modal.test.js.snap
@@ -11,7 +11,6 @@ exports[`renders DashboardSaveModal 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         label={
@@ -32,7 +31,6 @@ exports[`renders DashboardSaveModal 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         helpText={
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
index ac91a1a518304..56cda90c489b6 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
@@ -167,13 +167,13 @@ exports[`Inspector Data View component should render loading state 1`] = `
 exports[`Inspector Data View component should render single table without selector 1`] = `
 Array [
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     />
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -183,7 +183,7 @@ Array [
           class="euiPopover__anchor css-16vtueo-render"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-s-s-base-primary"
+            class="euiButton emotion-euiButtonDisplay-s-defaultMinWidth-s-base-primary"
             type="button"
           >
             <span
@@ -212,13 +212,13 @@ Array [
         class="euiTableHeaderMobile"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup emotion-euiFlexGroup-l-spaceBetween-baseline-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           />
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
               class="euiTableSortMobile"
@@ -306,18 +306,18 @@ Array [
                 class="euiTableCellContent euiTableCellContent--overflowingContent"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                  class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     123
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                      class="euiFlexGroup emotion-euiFlexGroup-none-flexStart-center-row"
                     />
                   </div>
                 </div>
@@ -332,10 +332,10 @@ Array [
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--wrap eui-xScroll"
+        class="euiFlexGroup eui-xScroll emotion-euiFlexGroup-wrap-s-spaceBetween-center-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -367,7 +367,7 @@ Array [
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <nav
             aria-label="Pagination for table: "
@@ -448,10 +448,10 @@ Array [
 exports[`Inspector Data View component should support multiple datatables 1`] = `
 Array [
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
         class="euiText emotion-euiText-xs"
@@ -468,17 +468,17 @@ Array [
         class="euiSpacer euiSpacer--xs emotion-euiSpacer-xs"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-center-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <strong>
             Selected:
           </strong>
         </div>
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -513,7 +513,7 @@ Array [
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -523,7 +523,7 @@ Array [
           class="euiPopover__anchor css-16vtueo-render"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-s-s-base-primary"
+            class="euiButton emotion-euiButtonDisplay-s-defaultMinWidth-s-base-primary"
             type="button"
           >
             <span
@@ -552,13 +552,13 @@ Array [
         class="euiTableHeaderMobile"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup emotion-euiFlexGroup-l-spaceBetween-baseline-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           />
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
               class="euiTableSortMobile"
@@ -647,18 +647,18 @@ Array [
                 class="euiTableCellContent euiTableCellContent--overflowingContent"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                  class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     123
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                      class="euiFlexGroup emotion-euiFlexGroup-none-flexStart-center-row"
                     />
                   </div>
                 </div>
@@ -673,10 +673,10 @@ Array [
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--wrap eui-xScroll"
+        class="euiFlexGroup eui-xScroll emotion-euiFlexGroup-wrap-s-spaceBetween-center-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -708,7 +708,7 @@ Array [
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <nav
             aria-label="Pagination for table: "
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/__snapshots__/bytes.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/__snapshots__/bytes.test.tsx.snap
index 2b71d1882b0cf..2c158e73bcdf5 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/__snapshots__/bytes.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/__snapshots__/bytes.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`BytesFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/__snapshots__/date.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/__snapshots__/date.test.tsx.snap
index 4560904c9b4c4..b9dd236d060bb 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/__snapshots__/date.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/__snapshots__/date.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`DateFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/__snapshots__/date_nanos.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/__snapshots__/date_nanos.test.tsx.snap
index 0d0962a281950..44847ff6fef5f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/__snapshots__/date_nanos.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/__snapshots__/date_nanos.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`DateFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap
index 85e0177964a29..63c85c382595f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`DurationFormatEditor should not render show suffix on dynamic output 1`
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -36,7 +35,6 @@ exports[`DurationFormatEditor should not render show suffix on dynamic output 1`
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -72,7 +70,6 @@ exports[`DurationFormatEditor should not render show suffix on dynamic output 1`
     describedByIds={Array []}
     display="row"
     error={null}
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -96,7 +93,6 @@ exports[`DurationFormatEditor should not render show suffix on dynamic output 1`
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -117,7 +113,6 @@ exports[`DurationFormatEditor should not render show suffix on dynamic output 1`
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -186,7 +181,6 @@ exports[`DurationFormatEditor should render human readable output normally 1`] =
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -217,7 +211,6 @@ exports[`DurationFormatEditor should render human readable output normally 1`] =
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -300,7 +293,6 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -331,7 +323,6 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -367,7 +358,6 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
     describedByIds={Array []}
     display="row"
     error={null}
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -391,7 +381,6 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -411,7 +400,6 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -432,7 +420,6 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/__snapshots__/histogram.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/__snapshots__/histogram.test.tsx.snap
index ddaeb7214d62e..a06385dfaeb96 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/__snapshots__/histogram.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/__snapshots__/histogram.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`HistogramFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Aggregated number format"
@@ -35,7 +34,6 @@ exports[`HistogramFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/__snapshots__/number.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/__snapshots__/number.test.tsx.snap
index 8b59c0da10167..5722b59a56557 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/__snapshots__/number.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/__snapshots__/number.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`NumberFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/__snapshots__/percent.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/__snapshots__/percent.test.tsx.snap
index 7d8ab5e682a3e..35c7b6997f029 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/__snapshots__/percent.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/__snapshots__/percent.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`PercentFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap
index d61c7df7ddb10..a23062126b77d 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap
@@ -91,7 +91,6 @@ exports[`StaticLookupFormatEditor should render multiple lookup entries and unkn
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
@@ -201,7 +200,6 @@ exports[`StaticLookupFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/__snapshots__/string.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/__snapshots__/string.test.tsx.snap
index ed52f89a0716b..eb821cd7e0694 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/__snapshots__/string.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/__snapshots__/string.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`StringFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.tsx.snap
index cc6eddbf0dc8c..5ca4e96c53f48 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`TruncateFormatEditor should render normally 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
index 80cea4c93a941..5cc6ef3f937f9 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
@@ -87,7 +87,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
       class="euiFormRow__fieldWrapper"
     >
       <div
-        class="euiSwitch"
+        class="euiSwitch emotion-euiSwitch"
       >
         <button
           aria-checked="false"
@@ -287,13 +287,13 @@ exports[`UrlFormatEditor should render normally 1`] = `
             class="euiTableHeaderMobile"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-l-spaceBetween-baseline-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               />
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               />
             </div>
           </div>
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap
index 71693a1e5cb8c..eecd78db02ef1 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`FormatEditorSamples should render normally 1`] = `
 <EuiFormRow
   describedByIds={Array []}
   display="row"
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   label={
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap
index b3cb1c95d0a3b..341c7e8e73f1d 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap
@@ -2,10 +2,10 @@
 
 exports[`Header should render normally 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-center-row"
 >
   <div
-    class="euiFlexItem"
+    class="euiFlexItem emotion-euiFlexItem-grow-1"
   >
     <div
       class="euiText emotion-euiText-s"
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
index 8f54936f4963b..55ad5eadaf81d 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
@@ -50,7 +50,7 @@ describe('DiscoverFieldSearch', () => {
     const onChange = jest.fn();
     const component = mountComponent({ ...defaultProps, ...{ onChange } });
     const btn = findTestSubject(component, 'toggleFieldFilterButton');
-    const badge = btn.find('.euiNotificationBadge');
+    const badge = btn.find('.euiNotificationBadge').last();
     expect(badge.text()).toEqual('0');
     btn.simulate('click');
     const aggregatableButtonGroup = findButtonGroup(component, 'aggregatable');
@@ -69,7 +69,7 @@ describe('DiscoverFieldSearch', () => {
     let btn = findTestSubject(component, 'toggleFieldFilterButton');
     btn.simulate('click');
     btn = findTestSubject(component, 'toggleFieldFilterButton');
-    const badge = btn.find('.euiNotificationBadge');
+    const badge = btn.find('.euiNotificationBadge').last();
     // no active filters
     expect(badge.text()).toEqual('0');
     // change value of aggregatable select
@@ -101,7 +101,7 @@ describe('DiscoverFieldSearch', () => {
     const component = mountComponent();
     const btn = findTestSubject(component, 'toggleFieldFilterButton');
     btn.simulate('click');
-    const badge = btn.find('.euiNotificationBadge');
+    const badge = btn.find('.euiNotificationBadge').last();
     expect(badge.text()).toEqual('0');
     const missingSwitch = findTestSubject(component, 'missingSwitch');
     missingSwitch.simulate('change', { target: { value: false } });
diff --git a/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.scss b/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.scss
index 80636ddda64d5..3376229f0b346 100644
--- a/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.scss
+++ b/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.scss
@@ -1,3 +1,8 @@
 .dscSkipButton {
   z-index: $euiZLevel1;
+  transition: none !important;
+  &:focus {
+    animation: none !important;
+    position: absolute;
+  }
 }
diff --git a/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.test.tsx b/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.test.tsx
index 1622879d050dd..4e008aa337a9d 100644
--- a/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.test.tsx
+++ b/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.test.tsx
@@ -23,7 +23,7 @@ describe('Skip to Bottom Button', function () {
 
   it('should be clickable', function () {
     component = mountWithIntl(<SkipBottomButton {...props} />);
-    component.find('button').simulate('click');
+    component.find('[data-test-subj="discoverSkipTableButton"]').last().simulate('click');
     expect(props.onClick).toHaveBeenCalled();
   });
 });
diff --git a/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.tsx b/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.tsx
index 1f1d63ae7647d..c3f7a40d9b27a 100644
--- a/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.tsx
+++ b/src/plugins/discover/public/application/main/components/skip_bottom_button/skip_bottom_button.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import './skip_bottom_button.scss';
-import { EuiSkipLink } from '@elastic/eui';
+import { EuiScreenReaderOnly, EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 export interface SkipBottomButtonProps {
@@ -20,22 +20,19 @@ export interface SkipBottomButtonProps {
 
 export function SkipBottomButton({ onClick }: SkipBottomButtonProps) {
   return (
-    <EuiSkipLink
-      size="s"
-      onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
-        // prevent the anchor to reload the page on click
-        event.preventDefault();
-        // The destinationId prop cannot be leveraged here as the table needs
-        // to be updated firsts
-        onClick();
-      }}
-      className="dscSkipButton"
-      id="dscSkipButton"
-      destinationId=""
-      data-test-subj="discoverSkipTableButton"
-      position="absolute"
-    >
-      <FormattedMessage id="discover.skipToBottomButtonLabel" defaultMessage="Go to end of table" />
-    </EuiSkipLink>
+    <EuiScreenReaderOnly showOnFocus>
+      <EuiButton
+        fill
+        size="s"
+        onClick={onClick}
+        className="dscSkipButton"
+        data-test-subj="discoverSkipTableButton"
+      >
+        <FormattedMessage
+          id="discover.skipToBottomButtonLabel"
+          defaultMessage="Go to end of table"
+        />
+      </EuiButton>
+    </EuiScreenReaderOnly>
   );
 }
diff --git a/src/plugins/discover/public/components/common/__snapshots__/loading_indicator.test.tsx.snap b/src/plugins/discover/public/components/common/__snapshots__/loading_indicator.test.tsx.snap
index 4bfcfb91f52dc..9b8907dc9b4e3 100644
--- a/src/plugins/discover/public/components/common/__snapshots__/loading_indicator.test.tsx.snap
+++ b/src/plugins/discover/public/components/common/__snapshots__/loading_indicator.test.tsx.snap
@@ -2,10 +2,10 @@
 
 exports[`Loading indicator default renders correctly 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-spaceAround-center-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <span
       aria-label="Loading"
@@ -18,10 +18,10 @@ exports[`Loading indicator default renders correctly 1`] = `
 
 exports[`Loading indicator elastic renders correctly 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-spaceAround-center-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <span
       aria-label="Loading"
diff --git a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
index a932d26890593..dda86fb0ebdc2 100644
--- a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
@@ -120,7 +120,7 @@ describe('Discover grid cell rendering', function () {
       />
     );
     expect(component.html()).toMatchInlineSnapshot(
-      `"<div class=\\"euiFlexGroup euiFlexGroup--directionRow\\"><div class=\\"euiFlexItem\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonIcon euiButtonIcon--xSmall css-1q7ycil-euiButtonIcon-empty-primary-hoverStyles\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
+      `"<div class=\\"euiFlexGroup css-1h68cm-euiFlexGroup-none-flexStart-stretch-row\\"><div class=\\"euiFlexItem css-9sbomz-euiFlexItem-grow-1\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem css-kpsrin-euiFlexItem-growZero\\"><button class=\\"euiButtonIcon euiButtonIcon--xSmall css-1q7ycil-euiButtonIcon-empty-primary-hoverStyles\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
     );
   });
 
@@ -146,7 +146,7 @@ describe('Discover grid cell rendering', function () {
       />
     );
     expect(component.html()).toMatchInlineSnapshot(
-      `"<div class=\\"euiFlexGroup euiFlexGroup--directionRow\\"><div class=\\"euiFlexItem\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonIcon euiButtonIcon--xSmall css-1q7ycil-euiButtonIcon-empty-primary-hoverStyles\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
+      `"<div class=\\"euiFlexGroup css-1h68cm-euiFlexGroup-none-flexStart-stretch-row\\"><div class=\\"euiFlexItem css-9sbomz-euiFlexItem-grow-1\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem css-kpsrin-euiFlexItem-growZero\\"><button class=\\"euiButtonIcon euiButtonIcon--xSmall css-1q7ycil-euiButtonIcon-empty-primary-hoverStyles\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
     );
     findTestSubject(component, 'docTableClosePopover').simulate('click');
     expect(closePopoverMockFn).toHaveBeenCalledTimes(1);
diff --git a/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap b/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
index 9cd75729a99c8..b26160d9d33bc 100644
--- a/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
+++ b/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`FieldName renders a geo field 1`] = `
 Array [
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldIcon"
+    class="euiFlexItem kbnDocViewer__fieldIcon emotion-euiFlexItem-growZero"
   >
     <span
       class="euiToken kbnFieldIcon emotion-euiToken-square-light-s-euiColorVis5"
@@ -17,10 +17,10 @@ Array [
     </span>
   </div>,
   <div
-    class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--wrap"
+    class="euiFlexGroup emotion-euiFlexGroup-wrap-none-flexStart-flexStart-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
+      class="euiFlexItem kbnDocViewer__fieldName eui-textBreakAll emotion-euiFlexItem-growZero"
     >
       <span
         class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
@@ -37,7 +37,7 @@ Array [
 exports[`FieldName renders a number field by providing a field record 1`] = `
 Array [
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldIcon"
+    class="euiFlexItem kbnDocViewer__fieldIcon emotion-euiFlexItem-growZero"
   >
     <span
       class="euiToken kbnFieldIcon emotion-euiToken-square-light-s-euiColorVis0"
@@ -51,10 +51,10 @@ Array [
     </span>
   </div>,
   <div
-    class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--wrap"
+    class="euiFlexGroup emotion-euiFlexGroup-wrap-none-flexStart-flexStart-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
+      class="euiFlexItem kbnDocViewer__fieldName eui-textBreakAll emotion-euiFlexItem-growZero"
     >
       <span
         class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
@@ -71,7 +71,7 @@ Array [
 exports[`FieldName renders a string field by providing fieldType and fieldName 1`] = `
 Array [
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldIcon"
+    class="euiFlexItem kbnDocViewer__fieldIcon emotion-euiFlexItem-growZero"
   >
     <span
       class="euiToken kbnFieldIcon emotion-euiToken-square-light-s-euiColorVis1"
@@ -85,10 +85,10 @@ Array [
     </span>
   </div>,
   <div
-    class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--wrap"
+    class="euiFlexGroup emotion-euiFlexGroup-wrap-none-flexStart-flexStart-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
+      class="euiFlexItem kbnDocViewer__fieldName eui-textBreakAll emotion-euiFlexItem-growZero"
     >
       <span
         class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
@@ -105,7 +105,7 @@ Array [
 exports[`FieldName renders unknown field 1`] = `
 Array [
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldIcon"
+    class="euiFlexItem kbnDocViewer__fieldIcon emotion-euiFlexItem-growZero"
   >
     <span
       class="euiToken kbnFieldIcon emotion-euiToken-circle-light-s-gray"
@@ -119,10 +119,10 @@ Array [
     </span>
   </div>,
   <div
-    class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--directionRow euiFlexGroup--wrap"
+    class="euiFlexGroup emotion-euiFlexGroup-wrap-none-flexStart-flexStart-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
+      class="euiFlexItem kbnDocViewer__fieldName eui-textBreakAll emotion-euiFlexItem-growZero"
     >
       <span
         class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
diff --git a/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx b/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx
index f499df891ef34..fdcfe33f5db9e 100644
--- a/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx
+++ b/src/plugins/discover/public/components/view_mode_toggle/view_mode_toggle.tsx
@@ -6,14 +6,7 @@
  * Side Public License, v 1.
  */
 
-import {
-  EuiTabs,
-  EuiTab,
-  useEuiPaddingSize,
-  EuiBetaBadge,
-  EuiFlexGroup,
-  EuiFlexItem,
-} from '@elastic/eui';
+import { EuiTabs, EuiTab, useEuiPaddingSize, EuiBetaBadge } from '@elastic/eui';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { css } from '@emotion/react';
@@ -37,8 +30,8 @@ export const DocumentViewModeToggle = ({
     background-color: ${euiThemeVars.euiPageBackgroundColor};
   `;
 
-  const badgeCellCss = css`
-    margin-left: ${useEuiPaddingSize('s')};
+  const betaBadgeCss = css`
+    vertical-align: middle;
   `;
 
   const showViewModeToggle = uiSettings.get(SHOW_FIELD_STATISTICS) ?? false;
@@ -62,24 +55,21 @@ export const DocumentViewModeToggle = ({
         onClick={() => setDiscoverViewMode(VIEW_MODE.AGGREGATED_LEVEL)}
         className="dscViewModeToggle__tab"
         data-test-subj="dscViewModeFieldStatsButton"
+        append={
+          <EuiBetaBadge
+            label={i18n.translate('discover.viewModes.fieldStatistics.betaTitle', {
+              defaultMessage: 'Beta',
+            })}
+            size="s"
+            className="fieldStatsBetaBadge"
+            css={betaBadgeCss}
+          />
+        }
       >
-        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
-          <EuiFlexItem>
-            <FormattedMessage
-              id="discover.viewModes.fieldStatistics.label"
-              defaultMessage="Field statistics"
-            />
-          </EuiFlexItem>
-          <EuiFlexItem css={badgeCellCss}>
-            <EuiBetaBadge
-              label={i18n.translate('discover.viewModes.fieldStatistics.betaTitle', {
-                defaultMessage: 'Beta',
-              })}
-              size="s"
-              className="fieldStatsBetaBadge"
-            />
-          </EuiFlexItem>
-        </EuiFlexGroup>
+        <FormattedMessage
+          id="discover.viewModes.fieldStatistics.label"
+          defaultMessage="Field statistics"
+        />
       </EuiTab>
     </EuiTabs>
   );
diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap b/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
index 692c006fe099a..aa3523d6951f0 100644
--- a/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
+++ b/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
@@ -1,9680 +1,3574 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CronEditor is rendered with a DAY frequency 1`] = `
-<CronEditor
-  cronExpression="0 10 * * * ?"
-  fieldToPreferredValueMap={Object {}}
-  frequency="DAY"
-  onChange={[Function]}
->
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={true}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label={
-      <FormattedMessage
-        defaultMessage="Frequency"
-        id="esUi.cronEditor.fieldFrequencyLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
+Array [
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    id="generated-id-row"
   >
     <div
-      className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-      id="generated-id-row"
+      class="euiFormRow__labelWrapper"
     >
-      <div
-        className="euiFormRow__labelWrapper"
-      >
-        <EuiFormLabel
-          className="euiFormRow__label"
-          htmlFor="generated-id"
-          id="generated-id-label"
-          isFocused={false}
-          type="label"
-        >
-          <label
-            className="euiFormLabel euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-          >
-            <FormattedMessage
-              defaultMessage="Frequency"
-              id="esUi.cronEditor.fieldFrequencyLabel"
-              values={Object {}}
-            >
-              Frequency
-            </FormattedMessage>
-          </label>
-        </EuiFormLabel>
-      </div>
-      <div
-        className="euiFormRow__fieldWrapper"
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
       >
-        <EuiSelect
-          data-test-subj="cronFrequencySelect"
-          fullWidth={true}
-          id="generated-id"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          options={
-            Array [
-              Object {
-                "text": "minute",
-                "value": "MINUTE",
-              },
-              Object {
-                "text": "hour",
-                "value": "HOUR",
-              },
-              Object {
-                "text": "day",
-                "value": "DAY",
-              },
-              Object {
-                "text": "week",
-                "value": "WEEK",
-              },
-              Object {
-                "text": "month",
-                "value": "MONTH",
-              },
-              Object {
-                "text": "year",
-                "value": "YEAR",
-              },
-            ]
-          }
-          prepend="Every"
-          value="DAY"
-        >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={true}
-            inputId="generated-id"
-            isDropdown={true}
-            isLoading={false}
-            prepend="Every"
-          >
-            <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-            >
-              <EuiFormLabel
-                className="euiFormControlLayout__prepend"
-                htmlFor="generated-id"
-              >
-                <label
-                  className="euiFormLabel euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  Every
-                </label>
-              </EuiFormLabel>
-              <div
-                className="euiFormControlLayout__childrenWrapper"
-              >
-                <EuiValidatableControl>
-                  <select
-                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                    data-test-subj="cronFrequencySelect"
-                    id="generated-id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="DAY"
-                  >
-                    <option
-                      key="0"
-                      value="MINUTE"
-                    >
-                      minute
-                    </option>
-                    <option
-                      key="1"
-                      value="HOUR"
-                    >
-                      hour
-                    </option>
-                    <option
-                      key="2"
-                      value="DAY"
-                    >
-                      day
-                    </option>
-                    <option
-                      key="3"
-                      value="WEEK"
-                    >
-                      week
-                    </option>
-                    <option
-                      key="4"
-                      value="MONTH"
-                    >
-                      month
-                    </option>
-                    <option
-                      key="5"
-                      value="YEAR"
-                    >
-                      year
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  isDropdown={true}
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                  >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
-                    >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
-                      >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
-                        >
-                          <span
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            data-euiicon-type="arrowDown"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
-              </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
-      </div>
+        Frequency
+      </label>
     </div>
-  </EuiFormRow>
-  <CronDaily
-    hour="*"
-    hourOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-      ]
-    }
-    minute="10"
-    minuteOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-        Object {
-          "text": "24",
-          "value": "24",
-        },
-        Object {
-          "text": "25",
-          "value": "25",
-        },
-        Object {
-          "text": "26",
-          "value": "26",
-        },
-        Object {
-          "text": "27",
-          "value": "27",
-        },
-        Object {
-          "text": "28",
-          "value": "28",
-        },
-        Object {
-          "text": "29",
-          "value": "29",
-        },
-        Object {
-          "text": "30",
-          "value": "30",
-        },
-        Object {
-          "text": "31",
-          "value": "31",
-        },
-        Object {
-          "text": "32",
-          "value": "32",
-        },
-        Object {
-          "text": "33",
-          "value": "33",
-        },
-        Object {
-          "text": "34",
-          "value": "34",
-        },
-        Object {
-          "text": "35",
-          "value": "35",
-        },
-        Object {
-          "text": "36",
-          "value": "36",
-        },
-        Object {
-          "text": "37",
-          "value": "37",
-        },
-        Object {
-          "text": "38",
-          "value": "38",
-        },
-        Object {
-          "text": "39",
-          "value": "39",
-        },
-        Object {
-          "text": "40",
-          "value": "40",
-        },
-        Object {
-          "text": "41",
-          "value": "41",
-        },
-        Object {
-          "text": "42",
-          "value": "42",
-        },
-        Object {
-          "text": "43",
-          "value": "43",
-        },
-        Object {
-          "text": "44",
-          "value": "44",
-        },
-        Object {
-          "text": "45",
-          "value": "45",
-        },
-        Object {
-          "text": "46",
-          "value": "46",
-        },
-        Object {
-          "text": "47",
-          "value": "47",
-        },
-        Object {
-          "text": "48",
-          "value": "48",
-        },
-        Object {
-          "text": "49",
-          "value": "49",
-        },
-        Object {
-          "text": "50",
-          "value": "50",
-        },
-        Object {
-          "text": "51",
-          "value": "51",
-        },
-        Object {
-          "text": "52",
-          "value": "52",
-        },
-        Object {
-          "text": "53",
-          "value": "53",
-        },
-        Object {
-          "text": "54",
-          "value": "54",
-        },
-        Object {
-          "text": "55",
-          "value": "55",
-        },
-        Object {
-          "text": "56",
-          "value": "56",
-        },
-        Object {
-          "text": "57",
-          "value": "57",
-        },
-        Object {
-          "text": "58",
-          "value": "58",
-        },
-        Object {
-          "text": "59",
-          "value": "59",
-        },
-      ]
-    }
-    onChange={[Function]}
-  >
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Time"
-          id="esUi.cronEditor.cronDaily.fieldTimeLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
+    <div
+      class="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
       >
-        <div
-          className="euiFormRow__labelWrapper"
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
         >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
-          >
-            <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Time"
-                id="esUi.cronEditor.cronDaily.fieldTimeLabel"
-                values={Object {}}
-              >
-                Time
-              </FormattedMessage>
-            </label>
-          </EuiFormLabel>
-        </div>
+          Every
+        </label>
         <div
-          className="euiFormRow__fieldWrapper"
+          class="euiFormControlLayout__childrenWrapper"
         >
-          <EuiFlexGroup
-            gutterSize="xs"
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencySelect"
             id="generated-id"
-            onBlur={[Function]}
-            onFocus={[Function]}
           >
-            <div
-              className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
-              id="generated-id"
-              onBlur={[Function]}
-              onFocus={[Function]}
+            <option
+              value="MINUTE"
             >
-              <EuiFlexItem
-                grow={false}
-              >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiSelect
-                    aria-label="Hour"
-                    data-test-subj="cronFrequencyDailyHourSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                      ]
-                    }
-                    prepend="At"
-                    value="*"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend="At"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            At
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Hour"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyDailyHourSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="*"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <div
-                  className="euiFlexItem"
-                >
-                  <EuiSelect
-                    aria-label="Minute"
-                    data-test-subj="cronFrequencyDailyMinuteSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                        Object {
-                          "text": "24",
-                          "value": "24",
-                        },
-                        Object {
-                          "text": "25",
-                          "value": "25",
-                        },
-                        Object {
-                          "text": "26",
-                          "value": "26",
-                        },
-                        Object {
-                          "text": "27",
-                          "value": "27",
-                        },
-                        Object {
-                          "text": "28",
-                          "value": "28",
-                        },
-                        Object {
-                          "text": "29",
-                          "value": "29",
-                        },
-                        Object {
-                          "text": "30",
-                          "value": "30",
-                        },
-                        Object {
-                          "text": "31",
-                          "value": "31",
-                        },
-                        Object {
-                          "text": "32",
-                          "value": "32",
-                        },
-                        Object {
-                          "text": "33",
-                          "value": "33",
-                        },
-                        Object {
-                          "text": "34",
-                          "value": "34",
-                        },
-                        Object {
-                          "text": "35",
-                          "value": "35",
-                        },
-                        Object {
-                          "text": "36",
-                          "value": "36",
-                        },
-                        Object {
-                          "text": "37",
-                          "value": "37",
-                        },
-                        Object {
-                          "text": "38",
-                          "value": "38",
-                        },
-                        Object {
-                          "text": "39",
-                          "value": "39",
-                        },
-                        Object {
-                          "text": "40",
-                          "value": "40",
-                        },
-                        Object {
-                          "text": "41",
-                          "value": "41",
-                        },
-                        Object {
-                          "text": "42",
-                          "value": "42",
-                        },
-                        Object {
-                          "text": "43",
-                          "value": "43",
-                        },
-                        Object {
-                          "text": "44",
-                          "value": "44",
-                        },
-                        Object {
-                          "text": "45",
-                          "value": "45",
-                        },
-                        Object {
-                          "text": "46",
-                          "value": "46",
-                        },
-                        Object {
-                          "text": "47",
-                          "value": "47",
-                        },
-                        Object {
-                          "text": "48",
-                          "value": "48",
-                        },
-                        Object {
-                          "text": "49",
-                          "value": "49",
-                        },
-                        Object {
-                          "text": "50",
-                          "value": "50",
-                        },
-                        Object {
-                          "text": "51",
-                          "value": "51",
-                        },
-                        Object {
-                          "text": "52",
-                          "value": "52",
-                        },
-                        Object {
-                          "text": "53",
-                          "value": "53",
-                        },
-                        Object {
-                          "text": "54",
-                          "value": "54",
-                        },
-                        Object {
-                          "text": "55",
-                          "value": "55",
-                        },
-                        Object {
-                          "text": "56",
-                          "value": "56",
-                        },
-                        Object {
-                          "text": "57",
-                          "value": "57",
-                        },
-                        Object {
-                          "text": "58",
-                          "value": "58",
-                        },
-                        Object {
-                          "text": "59",
-                          "value": "59",
-                        },
-                      ]
-                    }
-                    prepend=":"
-                    value="10"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend=":"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            :
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Minute"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyDailyMinuteSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="10"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                              <option
-                                key="24"
-                                value="24"
-                              >
-                                24
-                              </option>
-                              <option
-                                key="25"
-                                value="25"
-                              >
-                                25
-                              </option>
-                              <option
-                                key="26"
-                                value="26"
-                              >
-                                26
-                              </option>
-                              <option
-                                key="27"
-                                value="27"
-                              >
-                                27
-                              </option>
-                              <option
-                                key="28"
-                                value="28"
-                              >
-                                28
-                              </option>
-                              <option
-                                key="29"
-                                value="29"
-                              >
-                                29
-                              </option>
-                              <option
-                                key="30"
-                                value="30"
-                              >
-                                30
-                              </option>
-                              <option
-                                key="31"
-                                value="31"
-                              >
-                                31
-                              </option>
-                              <option
-                                key="32"
-                                value="32"
-                              >
-                                32
-                              </option>
-                              <option
-                                key="33"
-                                value="33"
-                              >
-                                33
-                              </option>
-                              <option
-                                key="34"
-                                value="34"
-                              >
-                                34
-                              </option>
-                              <option
-                                key="35"
-                                value="35"
-                              >
-                                35
-                              </option>
-                              <option
-                                key="36"
-                                value="36"
-                              >
-                                36
-                              </option>
-                              <option
-                                key="37"
-                                value="37"
-                              >
-                                37
-                              </option>
-                              <option
-                                key="38"
-                                value="38"
-                              >
-                                38
-                              </option>
-                              <option
-                                key="39"
-                                value="39"
-                              >
-                                39
-                              </option>
-                              <option
-                                key="40"
-                                value="40"
-                              >
-                                40
-                              </option>
-                              <option
-                                key="41"
-                                value="41"
-                              >
-                                41
-                              </option>
-                              <option
-                                key="42"
-                                value="42"
-                              >
-                                42
-                              </option>
-                              <option
-                                key="43"
-                                value="43"
-                              >
-                                43
-                              </option>
-                              <option
-                                key="44"
-                                value="44"
-                              >
-                                44
-                              </option>
-                              <option
-                                key="45"
-                                value="45"
-                              >
-                                45
-                              </option>
-                              <option
-                                key="46"
-                                value="46"
-                              >
-                                46
-                              </option>
-                              <option
-                                key="47"
-                                value="47"
-                              >
-                                47
-                              </option>
-                              <option
-                                key="48"
-                                value="48"
-                              >
-                                48
-                              </option>
-                              <option
-                                key="49"
-                                value="49"
-                              >
-                                49
-                              </option>
-                              <option
-                                key="50"
-                                value="50"
-                              >
-                                50
-                              </option>
-                              <option
-                                key="51"
-                                value="51"
-                              >
-                                51
-                              </option>
-                              <option
-                                key="52"
-                                value="52"
-                              >
-                                52
-                              </option>
-                              <option
-                                key="53"
-                                value="53"
-                              >
-                                53
-                              </option>
-                              <option
-                                key="54"
-                                value="54"
-                              >
-                                54
-                              </option>
-                              <option
-                                key="55"
-                                value="55"
-                              >
-                                55
-                              </option>
-                              <option
-                                key="56"
-                                value="56"
-                              >
-                                56
-                              </option>
-                              <option
-                                key="57"
-                                value="57"
-                              >
-                                57
-                              </option>
-                              <option
-                                key="58"
-                                value="58"
-                              >
-                                58
-                              </option>
-                              <option
-                                key="59"
-                                value="59"
-                              >
-                                59
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
-            </div>
-          </EuiFlexGroup>
+              minute
+            </option>
+            <option
+              value="HOUR"
+            >
+              hour
+            </option>
+            <option
+              value="DAY"
+            >
+              day
+            </option>
+            <option
+              value="WEEK"
+            >
+              week
+            </option>
+            <option
+              value="MONTH"
+            >
+              month
+            </option>
+            <option
+              value="YEAR"
+            >
+              year
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
         </div>
       </div>
-    </EuiFormRow>
-  </CronDaily>
-</CronEditor>
-`;
-
-exports[`CronEditor is rendered with a HOUR frequency 1`] = `
-<CronEditor
-  cronExpression="0 10 * * * ?"
-  fieldToPreferredValueMap={Object {}}
-  frequency="HOUR"
-  onChange={[Function]}
->
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={true}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label={
-      <FormattedMessage
-        defaultMessage="Frequency"
-        id="esUi.cronEditor.fieldFrequencyLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
   >
     <div
-      className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-      id="generated-id-row"
+      class="euiFormRow__labelWrapper"
     >
-      <div
-        className="euiFormRow__labelWrapper"
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
       >
-        <EuiFormLabel
-          className="euiFormRow__label"
-          htmlFor="generated-id"
-          id="generated-id-label"
-          isFocused={false}
-          type="label"
-        >
-          <label
-            className="euiFormLabel euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-          >
-            <FormattedMessage
-              defaultMessage="Frequency"
-              id="esUi.cronEditor.fieldFrequencyLabel"
-              values={Object {}}
-            >
-              Frequency
-            </FormattedMessage>
-          </label>
-        </EuiFormLabel>
-      </div>
+        Time
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
       <div
-        className="euiFormRow__fieldWrapper"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-stretch-row"
+        id="generated-id"
       >
-        <EuiSelect
-          data-test-subj="cronFrequencySelect"
-          fullWidth={true}
-          id="generated-id"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          options={
-            Array [
-              Object {
-                "text": "minute",
-                "value": "MINUTE",
-              },
-              Object {
-                "text": "hour",
-                "value": "HOUR",
-              },
-              Object {
-                "text": "day",
-                "value": "DAY",
-              },
-              Object {
-                "text": "week",
-                "value": "WEEK",
-              },
-              Object {
-                "text": "month",
-                "value": "MONTH",
-              },
-              Object {
-                "text": "year",
-                "value": "YEAR",
-              },
-            ]
-          }
-          prepend="Every"
-          value="HOUR"
+        <div
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={true}
-            inputId="generated-id"
-            isDropdown={true}
-            isLoading={false}
-            prepend="Every"
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
           >
+            <label
+              class="euiFormLabel euiFormControlLayout__prepend"
+            >
+              At
+            </label>
             <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+              class="euiFormControlLayout__childrenWrapper"
             >
-              <EuiFormLabel
-                className="euiFormControlLayout__prepend"
-                htmlFor="generated-id"
+              <select
+                aria-label="Hour"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyDailyHourSelect"
               >
-                <label
-                  className="euiFormLabel euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
                 >
-                  Every
-                </label>
-              </EuiFormLabel>
+                  08
+                </option>
+                <option
+                  value="9"
+                >
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+              </select>
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
               >
-                <EuiValidatableControl>
-                  <select
-                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                    data-test-subj="cronFrequencySelect"
-                    id="generated-id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="HOUR"
-                  >
-                    <option
-                      key="0"
-                      value="MINUTE"
-                    >
-                      minute
-                    </option>
-                    <option
-                      key="1"
-                      value="HOUR"
-                    >
-                      hour
-                    </option>
-                    <option
-                      key="2"
-                      value="DAY"
-                    >
-                      day
-                    </option>
-                    <option
-                      key="3"
-                      value="WEEK"
-                    >
-                      week
-                    </option>
-                    <option
-                      key="4"
-                      value="MONTH"
-                    >
-                      month
-                    </option>
-                    <option
-                      key="5"
-                      value="YEAR"
-                    >
-                      year
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  isDropdown={true}
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                  >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
-                    >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
-                      >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
-                        >
-                          <span
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            data-euiicon-type="arrowDown"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
               </div>
             </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
-      </div>
-    </div>
-  </EuiFormRow>
-  <CronHourly
-    minute="10"
-    minuteOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-        Object {
-          "text": "24",
-          "value": "24",
-        },
-        Object {
-          "text": "25",
-          "value": "25",
-        },
-        Object {
-          "text": "26",
-          "value": "26",
-        },
-        Object {
-          "text": "27",
-          "value": "27",
-        },
-        Object {
-          "text": "28",
-          "value": "28",
-        },
-        Object {
-          "text": "29",
-          "value": "29",
-        },
-        Object {
-          "text": "30",
-          "value": "30",
-        },
-        Object {
-          "text": "31",
-          "value": "31",
-        },
-        Object {
-          "text": "32",
-          "value": "32",
-        },
-        Object {
-          "text": "33",
-          "value": "33",
-        },
-        Object {
-          "text": "34",
-          "value": "34",
-        },
-        Object {
-          "text": "35",
-          "value": "35",
-        },
-        Object {
-          "text": "36",
-          "value": "36",
-        },
-        Object {
-          "text": "37",
-          "value": "37",
-        },
-        Object {
-          "text": "38",
-          "value": "38",
-        },
-        Object {
-          "text": "39",
-          "value": "39",
-        },
-        Object {
-          "text": "40",
-          "value": "40",
-        },
-        Object {
-          "text": "41",
-          "value": "41",
-        },
-        Object {
-          "text": "42",
-          "value": "42",
-        },
-        Object {
-          "text": "43",
-          "value": "43",
-        },
-        Object {
-          "text": "44",
-          "value": "44",
-        },
-        Object {
-          "text": "45",
-          "value": "45",
-        },
-        Object {
-          "text": "46",
-          "value": "46",
-        },
-        Object {
-          "text": "47",
-          "value": "47",
-        },
-        Object {
-          "text": "48",
-          "value": "48",
-        },
-        Object {
-          "text": "49",
-          "value": "49",
-        },
-        Object {
-          "text": "50",
-          "value": "50",
-        },
-        Object {
-          "text": "51",
-          "value": "51",
-        },
-        Object {
-          "text": "52",
-          "value": "52",
-        },
-        Object {
-          "text": "53",
-          "value": "53",
-        },
-        Object {
-          "text": "54",
-          "value": "54",
-        },
-        Object {
-          "text": "55",
-          "value": "55",
-        },
-        Object {
-          "text": "56",
-          "value": "56",
-        },
-        Object {
-          "text": "57",
-          "value": "57",
-        },
-        Object {
-          "text": "58",
-          "value": "58",
-        },
-        Object {
-          "text": "59",
-          "value": "59",
-        },
-      ]
-    }
-    onChange={[Function]}
-  >
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Minute"
-          id="esUi.cronEditor.cronHourly.fieldTimeLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
-    >
-      <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
-      >
-        <div
-          className="euiFormRow__labelWrapper"
-        >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
-          >
-            <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Minute"
-                id="esUi.cronEditor.cronHourly.fieldTimeLabel"
-                values={Object {}}
-              >
-                Minute
-              </FormattedMessage>
-            </label>
-          </EuiFormLabel>
+          </div>
         </div>
         <div
-          className="euiFormRow__fieldWrapper"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
-          <EuiSelect
-            data-test-subj="cronFrequencyHourlyMinuteSelect"
-            fullWidth={true}
-            id="generated-id"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            options={
-              Array [
-                Object {
-                  "text": "00",
-                  "value": "0",
-                },
-                Object {
-                  "text": "01",
-                  "value": "1",
-                },
-                Object {
-                  "text": "02",
-                  "value": "2",
-                },
-                Object {
-                  "text": "03",
-                  "value": "3",
-                },
-                Object {
-                  "text": "04",
-                  "value": "4",
-                },
-                Object {
-                  "text": "05",
-                  "value": "5",
-                },
-                Object {
-                  "text": "06",
-                  "value": "6",
-                },
-                Object {
-                  "text": "07",
-                  "value": "7",
-                },
-                Object {
-                  "text": "08",
-                  "value": "8",
-                },
-                Object {
-                  "text": "09",
-                  "value": "9",
-                },
-                Object {
-                  "text": "10",
-                  "value": "10",
-                },
-                Object {
-                  "text": "11",
-                  "value": "11",
-                },
-                Object {
-                  "text": "12",
-                  "value": "12",
-                },
-                Object {
-                  "text": "13",
-                  "value": "13",
-                },
-                Object {
-                  "text": "14",
-                  "value": "14",
-                },
-                Object {
-                  "text": "15",
-                  "value": "15",
-                },
-                Object {
-                  "text": "16",
-                  "value": "16",
-                },
-                Object {
-                  "text": "17",
-                  "value": "17",
-                },
-                Object {
-                  "text": "18",
-                  "value": "18",
-                },
-                Object {
-                  "text": "19",
-                  "value": "19",
-                },
-                Object {
-                  "text": "20",
-                  "value": "20",
-                },
-                Object {
-                  "text": "21",
-                  "value": "21",
-                },
-                Object {
-                  "text": "22",
-                  "value": "22",
-                },
-                Object {
-                  "text": "23",
-                  "value": "23",
-                },
-                Object {
-                  "text": "24",
-                  "value": "24",
-                },
-                Object {
-                  "text": "25",
-                  "value": "25",
-                },
-                Object {
-                  "text": "26",
-                  "value": "26",
-                },
-                Object {
-                  "text": "27",
-                  "value": "27",
-                },
-                Object {
-                  "text": "28",
-                  "value": "28",
-                },
-                Object {
-                  "text": "29",
-                  "value": "29",
-                },
-                Object {
-                  "text": "30",
-                  "value": "30",
-                },
-                Object {
-                  "text": "31",
-                  "value": "31",
-                },
-                Object {
-                  "text": "32",
-                  "value": "32",
-                },
-                Object {
-                  "text": "33",
-                  "value": "33",
-                },
-                Object {
-                  "text": "34",
-                  "value": "34",
-                },
-                Object {
-                  "text": "35",
-                  "value": "35",
-                },
-                Object {
-                  "text": "36",
-                  "value": "36",
-                },
-                Object {
-                  "text": "37",
-                  "value": "37",
-                },
-                Object {
-                  "text": "38",
-                  "value": "38",
-                },
-                Object {
-                  "text": "39",
-                  "value": "39",
-                },
-                Object {
-                  "text": "40",
-                  "value": "40",
-                },
-                Object {
-                  "text": "41",
-                  "value": "41",
-                },
-                Object {
-                  "text": "42",
-                  "value": "42",
-                },
-                Object {
-                  "text": "43",
-                  "value": "43",
-                },
-                Object {
-                  "text": "44",
-                  "value": "44",
-                },
-                Object {
-                  "text": "45",
-                  "value": "45",
-                },
-                Object {
-                  "text": "46",
-                  "value": "46",
-                },
-                Object {
-                  "text": "47",
-                  "value": "47",
-                },
-                Object {
-                  "text": "48",
-                  "value": "48",
-                },
-                Object {
-                  "text": "49",
-                  "value": "49",
-                },
-                Object {
-                  "text": "50",
-                  "value": "50",
-                },
-                Object {
-                  "text": "51",
-                  "value": "51",
-                },
-                Object {
-                  "text": "52",
-                  "value": "52",
-                },
-                Object {
-                  "text": "53",
-                  "value": "53",
-                },
-                Object {
-                  "text": "54",
-                  "value": "54",
-                },
-                Object {
-                  "text": "55",
-                  "value": "55",
-                },
-                Object {
-                  "text": "56",
-                  "value": "56",
-                },
-                Object {
-                  "text": "57",
-                  "value": "57",
-                },
-                Object {
-                  "text": "58",
-                  "value": "58",
-                },
-                Object {
-                  "text": "59",
-                  "value": "59",
-                },
-              ]
-            }
-            prepend="At"
-            value="10"
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
           >
-            <EuiFormControlLayout
-              compressed={false}
-              fullWidth={true}
-              inputId="generated-id"
-              isDropdown={true}
-              isLoading={false}
-              prepend="At"
+            <label
+              class="euiFormLabel euiFormControlLayout__prepend"
             >
-              <div
-                className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-              >
-                <EuiFormLabel
-                  className="euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  <label
-                    className="euiFormLabel euiFormControlLayout__prepend"
-                    htmlFor="generated-id"
-                  >
-                    At
-                  </label>
-                </EuiFormLabel>
-                <div
-                  className="euiFormControlLayout__childrenWrapper"
-                >
-                  <EuiValidatableControl>
-                    <select
-                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                      data-test-subj="cronFrequencyHourlyMinuteSelect"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      onMouseUp={[Function]}
-                      value="10"
-                    >
-                      <option
-                        key="0"
-                        value="0"
-                      >
-                        00
-                      </option>
-                      <option
-                        key="1"
-                        value="1"
-                      >
-                        01
-                      </option>
-                      <option
-                        key="2"
-                        value="2"
-                      >
-                        02
-                      </option>
-                      <option
-                        key="3"
-                        value="3"
-                      >
-                        03
-                      </option>
-                      <option
-                        key="4"
-                        value="4"
-                      >
-                        04
-                      </option>
-                      <option
-                        key="5"
-                        value="5"
-                      >
-                        05
-                      </option>
-                      <option
-                        key="6"
-                        value="6"
-                      >
-                        06
-                      </option>
-                      <option
-                        key="7"
-                        value="7"
-                      >
-                        07
-                      </option>
-                      <option
-                        key="8"
-                        value="8"
-                      >
-                        08
-                      </option>
-                      <option
-                        key="9"
-                        value="9"
-                      >
-                        09
-                      </option>
-                      <option
-                        key="10"
-                        value="10"
-                      >
-                        10
-                      </option>
-                      <option
-                        key="11"
-                        value="11"
-                      >
-                        11
-                      </option>
-                      <option
-                        key="12"
-                        value="12"
-                      >
-                        12
-                      </option>
-                      <option
-                        key="13"
-                        value="13"
-                      >
-                        13
-                      </option>
-                      <option
-                        key="14"
-                        value="14"
-                      >
-                        14
-                      </option>
-                      <option
-                        key="15"
-                        value="15"
-                      >
-                        15
-                      </option>
-                      <option
-                        key="16"
-                        value="16"
-                      >
-                        16
-                      </option>
-                      <option
-                        key="17"
-                        value="17"
-                      >
-                        17
-                      </option>
-                      <option
-                        key="18"
-                        value="18"
-                      >
-                        18
-                      </option>
-                      <option
-                        key="19"
-                        value="19"
-                      >
-                        19
-                      </option>
-                      <option
-                        key="20"
-                        value="20"
-                      >
-                        20
-                      </option>
-                      <option
-                        key="21"
-                        value="21"
-                      >
-                        21
-                      </option>
-                      <option
-                        key="22"
-                        value="22"
-                      >
-                        22
-                      </option>
-                      <option
-                        key="23"
-                        value="23"
-                      >
-                        23
-                      </option>
-                      <option
-                        key="24"
-                        value="24"
-                      >
-                        24
-                      </option>
-                      <option
-                        key="25"
-                        value="25"
-                      >
-                        25
-                      </option>
-                      <option
-                        key="26"
-                        value="26"
-                      >
-                        26
-                      </option>
-                      <option
-                        key="27"
-                        value="27"
-                      >
-                        27
-                      </option>
-                      <option
-                        key="28"
-                        value="28"
-                      >
-                        28
-                      </option>
-                      <option
-                        key="29"
-                        value="29"
-                      >
-                        29
-                      </option>
-                      <option
-                        key="30"
-                        value="30"
-                      >
-                        30
-                      </option>
-                      <option
-                        key="31"
-                        value="31"
-                      >
-                        31
-                      </option>
-                      <option
-                        key="32"
-                        value="32"
-                      >
-                        32
-                      </option>
-                      <option
-                        key="33"
-                        value="33"
-                      >
-                        33
-                      </option>
-                      <option
-                        key="34"
-                        value="34"
-                      >
-                        34
-                      </option>
-                      <option
-                        key="35"
-                        value="35"
-                      >
-                        35
-                      </option>
-                      <option
-                        key="36"
-                        value="36"
-                      >
-                        36
-                      </option>
-                      <option
-                        key="37"
-                        value="37"
-                      >
-                        37
-                      </option>
-                      <option
-                        key="38"
-                        value="38"
-                      >
-                        38
-                      </option>
-                      <option
-                        key="39"
-                        value="39"
-                      >
-                        39
-                      </option>
-                      <option
-                        key="40"
-                        value="40"
-                      >
-                        40
-                      </option>
-                      <option
-                        key="41"
-                        value="41"
-                      >
-                        41
-                      </option>
-                      <option
-                        key="42"
-                        value="42"
-                      >
-                        42
-                      </option>
-                      <option
-                        key="43"
-                        value="43"
-                      >
-                        43
-                      </option>
-                      <option
-                        key="44"
-                        value="44"
-                      >
-                        44
-                      </option>
-                      <option
-                        key="45"
-                        value="45"
-                      >
-                        45
-                      </option>
-                      <option
-                        key="46"
-                        value="46"
-                      >
-                        46
-                      </option>
-                      <option
-                        key="47"
-                        value="47"
-                      >
-                        47
-                      </option>
-                      <option
-                        key="48"
-                        value="48"
-                      >
-                        48
-                      </option>
-                      <option
-                        key="49"
-                        value="49"
-                      >
-                        49
-                      </option>
-                      <option
-                        key="50"
-                        value="50"
-                      >
-                        50
-                      </option>
-                      <option
-                        key="51"
-                        value="51"
-                      >
-                        51
-                      </option>
-                      <option
-                        key="52"
-                        value="52"
-                      >
-                        52
-                      </option>
-                      <option
-                        key="53"
-                        value="53"
-                      >
-                        53
-                      </option>
-                      <option
-                        key="54"
-                        value="54"
-                      >
-                        54
-                      </option>
-                      <option
-                        key="55"
-                        value="55"
-                      >
-                        55
-                      </option>
-                      <option
-                        key="56"
-                        value="56"
-                      >
-                        56
-                      </option>
-                      <option
-                        key="57"
-                        value="57"
-                      >
-                        57
-                      </option>
-                      <option
-                        key="58"
-                        value="58"
-                      >
-                        58
-                      </option>
-                      <option
-                        key="59"
-                        value="59"
-                      >
-                        59
-                      </option>
-                    </select>
-                  </EuiValidatableControl>
-                  <EuiFormControlLayoutIcons
-                    compressed={false}
-                    isDropdown={true}
-                    isLoading={false}
-                  >
-                    <div
-                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                    >
-                      <EuiFormControlLayoutCustomIcon
-                        size="m"
-                        type="arrowDown"
-                      >
-                        <span
-                          className="euiFormControlLayoutCustomIcon"
-                        >
-                          <EuiIcon
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            size="m"
-                            type="arrowDown"
-                          >
-                            <span
-                              aria-hidden="true"
-                              className="euiFormControlLayoutCustomIcon__icon"
-                              data-euiicon-type="arrowDown"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                      </EuiFormControlLayoutCustomIcon>
-                    </div>
-                  </EuiFormControlLayoutIcons>
-                </div>
-              </div>
-            </EuiFormControlLayout>
-          </EuiSelect>
-        </div>
-      </div>
-    </EuiFormRow>
-  </CronHourly>
-</CronEditor>
-`;
-
-exports[`CronEditor is rendered with a MINUTE frequency 1`] = `
-<CronEditor
-  cronExpression="0 10 * * * ?"
-  fieldToPreferredValueMap={Object {}}
-  frequency="MINUTE"
-  onChange={[Function]}
->
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={true}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label={
-      <FormattedMessage
-        defaultMessage="Frequency"
-        id="esUi.cronEditor.fieldFrequencyLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
-  >
-    <div
-      className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-      id="generated-id-row"
-    >
-      <div
-        className="euiFormRow__labelWrapper"
-      >
-        <EuiFormLabel
-          className="euiFormRow__label"
-          htmlFor="generated-id"
-          id="generated-id-label"
-          isFocused={false}
-          type="label"
-        >
-          <label
-            className="euiFormLabel euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-          >
-            <FormattedMessage
-              defaultMessage="Frequency"
-              id="esUi.cronEditor.fieldFrequencyLabel"
-              values={Object {}}
-            >
-              Frequency
-            </FormattedMessage>
-          </label>
-        </EuiFormLabel>
-      </div>
-      <div
-        className="euiFormRow__fieldWrapper"
-      >
-        <EuiSelect
-          data-test-subj="cronFrequencySelect"
-          fullWidth={true}
-          id="generated-id"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          options={
-            Array [
-              Object {
-                "text": "minute",
-                "value": "MINUTE",
-              },
-              Object {
-                "text": "hour",
-                "value": "HOUR",
-              },
-              Object {
-                "text": "day",
-                "value": "DAY",
-              },
-              Object {
-                "text": "week",
-                "value": "WEEK",
-              },
-              Object {
-                "text": "month",
-                "value": "MONTH",
-              },
-              Object {
-                "text": "year",
-                "value": "YEAR",
-              },
-            ]
-          }
-          prepend="Every"
-          value="MINUTE"
-        >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={true}
-            inputId="generated-id"
-            isDropdown={true}
-            isLoading={false}
-            prepend="Every"
-          >
+              :
+            </label>
             <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+              class="euiFormControlLayout__childrenWrapper"
             >
-              <EuiFormLabel
-                className="euiFormControlLayout__prepend"
-                htmlFor="generated-id"
+              <select
+                aria-label="Minute"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyDailyMinuteSelect"
               >
-                <label
-                  className="euiFormLabel euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
+                >
+                  08
+                </option>
+                <option
+                  value="9"
                 >
-                  Every
-                </label>
-              </EuiFormLabel>
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+                <option
+                  value="24"
+                >
+                  24
+                </option>
+                <option
+                  value="25"
+                >
+                  25
+                </option>
+                <option
+                  value="26"
+                >
+                  26
+                </option>
+                <option
+                  value="27"
+                >
+                  27
+                </option>
+                <option
+                  value="28"
+                >
+                  28
+                </option>
+                <option
+                  value="29"
+                >
+                  29
+                </option>
+                <option
+                  value="30"
+                >
+                  30
+                </option>
+                <option
+                  value="31"
+                >
+                  31
+                </option>
+                <option
+                  value="32"
+                >
+                  32
+                </option>
+                <option
+                  value="33"
+                >
+                  33
+                </option>
+                <option
+                  value="34"
+                >
+                  34
+                </option>
+                <option
+                  value="35"
+                >
+                  35
+                </option>
+                <option
+                  value="36"
+                >
+                  36
+                </option>
+                <option
+                  value="37"
+                >
+                  37
+                </option>
+                <option
+                  value="38"
+                >
+                  38
+                </option>
+                <option
+                  value="39"
+                >
+                  39
+                </option>
+                <option
+                  value="40"
+                >
+                  40
+                </option>
+                <option
+                  value="41"
+                >
+                  41
+                </option>
+                <option
+                  value="42"
+                >
+                  42
+                </option>
+                <option
+                  value="43"
+                >
+                  43
+                </option>
+                <option
+                  value="44"
+                >
+                  44
+                </option>
+                <option
+                  value="45"
+                >
+                  45
+                </option>
+                <option
+                  value="46"
+                >
+                  46
+                </option>
+                <option
+                  value="47"
+                >
+                  47
+                </option>
+                <option
+                  value="48"
+                >
+                  48
+                </option>
+                <option
+                  value="49"
+                >
+                  49
+                </option>
+                <option
+                  value="50"
+                >
+                  50
+                </option>
+                <option
+                  value="51"
+                >
+                  51
+                </option>
+                <option
+                  value="52"
+                >
+                  52
+                </option>
+                <option
+                  value="53"
+                >
+                  53
+                </option>
+                <option
+                  value="54"
+                >
+                  54
+                </option>
+                <option
+                  value="55"
+                >
+                  55
+                </option>
+                <option
+                  value="56"
+                >
+                  56
+                </option>
+                <option
+                  value="57"
+                >
+                  57
+                </option>
+                <option
+                  value="58"
+                >
+                  58
+                </option>
+                <option
+                  value="59"
+                >
+                  59
+                </option>
+              </select>
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
               >
-                <EuiValidatableControl>
-                  <select
-                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                    data-test-subj="cronFrequencySelect"
-                    id="generated-id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="MINUTE"
-                  >
-                    <option
-                      key="0"
-                      value="MINUTE"
-                    >
-                      minute
-                    </option>
-                    <option
-                      key="1"
-                      value="HOUR"
-                    >
-                      hour
-                    </option>
-                    <option
-                      key="2"
-                      value="DAY"
-                    >
-                      day
-                    </option>
-                    <option
-                      key="3"
-                      value="WEEK"
-                    >
-                      week
-                    </option>
-                    <option
-                      key="4"
-                      value="MONTH"
-                    >
-                      month
-                    </option>
-                    <option
-                      key="5"
-                      value="YEAR"
-                    >
-                      year
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  isDropdown={true}
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                  >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
-                    >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
-                      >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
-                        >
-                          <span
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            data-euiicon-type="arrowDown"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
               </div>
             </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
+          </div>
+        </div>
       </div>
     </div>
-  </EuiFormRow>
-</CronEditor>
+  </div>,
+]
 `;
 
-exports[`CronEditor is rendered with a MONTH frequency 1`] = `
-<CronEditor
-  cronExpression="0 10 * * * ?"
-  fieldToPreferredValueMap={Object {}}
-  frequency="MONTH"
-  onChange={[Function]}
->
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={true}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label={
-      <FormattedMessage
-        defaultMessage="Frequency"
-        id="esUi.cronEditor.fieldFrequencyLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
+exports[`CronEditor is rendered with a HOUR frequency 1`] = `
+Array [
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    id="generated-id-row"
   >
     <div
-      className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-      id="generated-id-row"
+      class="euiFormRow__labelWrapper"
     >
-      <div
-        className="euiFormRow__labelWrapper"
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
       >
-        <EuiFormLabel
-          className="euiFormRow__label"
-          htmlFor="generated-id"
-          id="generated-id-label"
-          isFocused={false}
-          type="label"
-        >
-          <label
-            className="euiFormLabel euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-          >
-            <FormattedMessage
-              defaultMessage="Frequency"
-              id="esUi.cronEditor.fieldFrequencyLabel"
-              values={Object {}}
-            >
-              Frequency
-            </FormattedMessage>
-          </label>
-        </EuiFormLabel>
-      </div>
-      <div
-        className="euiFormRow__fieldWrapper"
-      >
-        <EuiSelect
-          data-test-subj="cronFrequencySelect"
-          fullWidth={true}
-          id="generated-id"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          options={
-            Array [
-              Object {
-                "text": "minute",
-                "value": "MINUTE",
-              },
-              Object {
-                "text": "hour",
-                "value": "HOUR",
-              },
-              Object {
-                "text": "day",
-                "value": "DAY",
-              },
-              Object {
-                "text": "week",
-                "value": "WEEK",
-              },
-              Object {
-                "text": "month",
-                "value": "MONTH",
-              },
-              Object {
-                "text": "year",
-                "value": "YEAR",
-              },
-            ]
-          }
-          prepend="Every"
-          value="MONTH"
-        >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={true}
-            inputId="generated-id"
-            isDropdown={true}
-            isLoading={false}
-            prepend="Every"
-          >
-            <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-            >
-              <EuiFormLabel
-                className="euiFormControlLayout__prepend"
-                htmlFor="generated-id"
-              >
-                <label
-                  className="euiFormLabel euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  Every
-                </label>
-              </EuiFormLabel>
-              <div
-                className="euiFormControlLayout__childrenWrapper"
-              >
-                <EuiValidatableControl>
-                  <select
-                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                    data-test-subj="cronFrequencySelect"
-                    id="generated-id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="MONTH"
-                  >
-                    <option
-                      key="0"
-                      value="MINUTE"
-                    >
-                      minute
-                    </option>
-                    <option
-                      key="1"
-                      value="HOUR"
-                    >
-                      hour
-                    </option>
-                    <option
-                      key="2"
-                      value="DAY"
-                    >
-                      day
-                    </option>
-                    <option
-                      key="3"
-                      value="WEEK"
-                    >
-                      week
-                    </option>
-                    <option
-                      key="4"
-                      value="MONTH"
-                    >
-                      month
-                    </option>
-                    <option
-                      key="5"
-                      value="YEAR"
-                    >
-                      year
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  isDropdown={true}
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                  >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
-                    >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
-                      >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
-                        >
-                          <span
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            data-euiicon-type="arrowDown"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
-              </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
-      </div>
+        Frequency
+      </label>
     </div>
-  </EuiFormRow>
-  <CronMonthly
-    date="*"
-    dateOptions={
-      Array [
-        Object {
-          "text": "1st",
-          "value": "1",
-        },
-        Object {
-          "text": "2nd",
-          "value": "2",
-        },
-        Object {
-          "text": "3rd",
-          "value": "3",
-        },
-        Object {
-          "text": "4th",
-          "value": "4",
-        },
-        Object {
-          "text": "5th",
-          "value": "5",
-        },
-        Object {
-          "text": "6th",
-          "value": "6",
-        },
-        Object {
-          "text": "7th",
-          "value": "7",
-        },
-        Object {
-          "text": "8th",
-          "value": "8",
-        },
-        Object {
-          "text": "9th",
-          "value": "9",
-        },
-        Object {
-          "text": "10th",
-          "value": "10",
-        },
-        Object {
-          "text": "11st",
-          "value": "11",
-        },
-        Object {
-          "text": "12nd",
-          "value": "12",
-        },
-        Object {
-          "text": "13rd",
-          "value": "13",
-        },
-        Object {
-          "text": "14th",
-          "value": "14",
-        },
-        Object {
-          "text": "15th",
-          "value": "15",
-        },
-        Object {
-          "text": "16th",
-          "value": "16",
-        },
-        Object {
-          "text": "17th",
-          "value": "17",
-        },
-        Object {
-          "text": "18th",
-          "value": "18",
-        },
-        Object {
-          "text": "19th",
-          "value": "19",
-        },
-        Object {
-          "text": "20th",
-          "value": "20",
-        },
-        Object {
-          "text": "21st",
-          "value": "21",
-        },
-        Object {
-          "text": "22nd",
-          "value": "22",
-        },
-        Object {
-          "text": "23rd",
-          "value": "23",
-        },
-        Object {
-          "text": "24th",
-          "value": "24",
-        },
-        Object {
-          "text": "25th",
-          "value": "25",
-        },
-        Object {
-          "text": "26th",
-          "value": "26",
-        },
-        Object {
-          "text": "27th",
-          "value": "27",
-        },
-        Object {
-          "text": "28th",
-          "value": "28",
-        },
-        Object {
-          "text": "29th",
-          "value": "29",
-        },
-        Object {
-          "text": "30th",
-          "value": "30",
-        },
-        Object {
-          "text": "31st",
-          "value": "31",
-        },
-      ]
-    }
-    hour="*"
-    hourOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-      ]
-    }
-    minute="10"
-    minuteOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-        Object {
-          "text": "24",
-          "value": "24",
-        },
-        Object {
-          "text": "25",
-          "value": "25",
-        },
-        Object {
-          "text": "26",
-          "value": "26",
-        },
-        Object {
-          "text": "27",
-          "value": "27",
-        },
-        Object {
-          "text": "28",
-          "value": "28",
-        },
-        Object {
-          "text": "29",
-          "value": "29",
-        },
-        Object {
-          "text": "30",
-          "value": "30",
-        },
-        Object {
-          "text": "31",
-          "value": "31",
-        },
-        Object {
-          "text": "32",
-          "value": "32",
-        },
-        Object {
-          "text": "33",
-          "value": "33",
-        },
-        Object {
-          "text": "34",
-          "value": "34",
-        },
-        Object {
-          "text": "35",
-          "value": "35",
-        },
-        Object {
-          "text": "36",
-          "value": "36",
-        },
-        Object {
-          "text": "37",
-          "value": "37",
-        },
-        Object {
-          "text": "38",
-          "value": "38",
-        },
-        Object {
-          "text": "39",
-          "value": "39",
-        },
-        Object {
-          "text": "40",
-          "value": "40",
-        },
-        Object {
-          "text": "41",
-          "value": "41",
-        },
-        Object {
-          "text": "42",
-          "value": "42",
-        },
-        Object {
-          "text": "43",
-          "value": "43",
-        },
-        Object {
-          "text": "44",
-          "value": "44",
-        },
-        Object {
-          "text": "45",
-          "value": "45",
-        },
-        Object {
-          "text": "46",
-          "value": "46",
-        },
-        Object {
-          "text": "47",
-          "value": "47",
-        },
-        Object {
-          "text": "48",
-          "value": "48",
-        },
-        Object {
-          "text": "49",
-          "value": "49",
-        },
-        Object {
-          "text": "50",
-          "value": "50",
-        },
-        Object {
-          "text": "51",
-          "value": "51",
-        },
-        Object {
-          "text": "52",
-          "value": "52",
-        },
-        Object {
-          "text": "53",
-          "value": "53",
-        },
-        Object {
-          "text": "54",
-          "value": "54",
-        },
-        Object {
-          "text": "55",
-          "value": "55",
-        },
-        Object {
-          "text": "56",
-          "value": "56",
-        },
-        Object {
-          "text": "57",
-          "value": "57",
-        },
-        Object {
-          "text": "58",
-          "value": "58",
-        },
-        Object {
-          "text": "59",
-          "value": "59",
-        },
-      ]
-    }
-    onChange={[Function]}
-  >
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Date"
-          id="esUi.cronEditor.cronMonthly.fieldDateLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
+    <div
+      class="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
       >
-        <div
-          className="euiFormRow__labelWrapper"
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
         >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
-          >
-            <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Date"
-                id="esUi.cronEditor.cronMonthly.fieldDateLabel"
-                values={Object {}}
-              >
-                Date
-              </FormattedMessage>
-            </label>
-          </EuiFormLabel>
-        </div>
+          Every
+        </label>
         <div
-          className="euiFormRow__fieldWrapper"
+          class="euiFormControlLayout__childrenWrapper"
         >
-          <EuiSelect
-            data-test-subj="cronFrequencyMonthlyDateSelect"
-            fullWidth={true}
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencySelect"
             id="generated-id"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            options={
-              Array [
-                Object {
-                  "text": "1st",
-                  "value": "1",
-                },
-                Object {
-                  "text": "2nd",
-                  "value": "2",
-                },
-                Object {
-                  "text": "3rd",
-                  "value": "3",
-                },
-                Object {
-                  "text": "4th",
-                  "value": "4",
-                },
-                Object {
-                  "text": "5th",
-                  "value": "5",
-                },
-                Object {
-                  "text": "6th",
-                  "value": "6",
-                },
-                Object {
-                  "text": "7th",
-                  "value": "7",
-                },
-                Object {
-                  "text": "8th",
-                  "value": "8",
-                },
-                Object {
-                  "text": "9th",
-                  "value": "9",
-                },
-                Object {
-                  "text": "10th",
-                  "value": "10",
-                },
-                Object {
-                  "text": "11st",
-                  "value": "11",
-                },
-                Object {
-                  "text": "12nd",
-                  "value": "12",
-                },
-                Object {
-                  "text": "13rd",
-                  "value": "13",
-                },
-                Object {
-                  "text": "14th",
-                  "value": "14",
-                },
-                Object {
-                  "text": "15th",
-                  "value": "15",
-                },
-                Object {
-                  "text": "16th",
-                  "value": "16",
-                },
-                Object {
-                  "text": "17th",
-                  "value": "17",
-                },
-                Object {
-                  "text": "18th",
-                  "value": "18",
-                },
-                Object {
-                  "text": "19th",
-                  "value": "19",
-                },
-                Object {
-                  "text": "20th",
-                  "value": "20",
-                },
-                Object {
-                  "text": "21st",
-                  "value": "21",
-                },
-                Object {
-                  "text": "22nd",
-                  "value": "22",
-                },
-                Object {
-                  "text": "23rd",
-                  "value": "23",
-                },
-                Object {
-                  "text": "24th",
-                  "value": "24",
-                },
-                Object {
-                  "text": "25th",
-                  "value": "25",
-                },
-                Object {
-                  "text": "26th",
-                  "value": "26",
-                },
-                Object {
-                  "text": "27th",
-                  "value": "27",
-                },
-                Object {
-                  "text": "28th",
-                  "value": "28",
-                },
-                Object {
-                  "text": "29th",
-                  "value": "29",
-                },
-                Object {
-                  "text": "30th",
-                  "value": "30",
-                },
-                Object {
-                  "text": "31st",
-                  "value": "31",
-                },
-              ]
-            }
-            prepend="On the"
-            value="*"
           >
-            <EuiFormControlLayout
-              compressed={false}
-              fullWidth={true}
-              inputId="generated-id"
-              isDropdown={true}
-              isLoading={false}
-              prepend="On the"
+            <option
+              value="MINUTE"
             >
-              <div
-                className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-              >
-                <EuiFormLabel
-                  className="euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  <label
-                    className="euiFormLabel euiFormControlLayout__prepend"
-                    htmlFor="generated-id"
-                  >
-                    On the
-                  </label>
-                </EuiFormLabel>
-                <div
-                  className="euiFormControlLayout__childrenWrapper"
-                >
-                  <EuiValidatableControl>
-                    <select
-                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                      data-test-subj="cronFrequencyMonthlyDateSelect"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      onMouseUp={[Function]}
-                      value="*"
-                    >
-                      <option
-                        key="0"
-                        value="1"
-                      >
-                        1st
-                      </option>
-                      <option
-                        key="1"
-                        value="2"
-                      >
-                        2nd
-                      </option>
-                      <option
-                        key="2"
-                        value="3"
-                      >
-                        3rd
-                      </option>
-                      <option
-                        key="3"
-                        value="4"
-                      >
-                        4th
-                      </option>
-                      <option
-                        key="4"
-                        value="5"
-                      >
-                        5th
-                      </option>
-                      <option
-                        key="5"
-                        value="6"
-                      >
-                        6th
-                      </option>
-                      <option
-                        key="6"
-                        value="7"
-                      >
-                        7th
-                      </option>
-                      <option
-                        key="7"
-                        value="8"
-                      >
-                        8th
-                      </option>
-                      <option
-                        key="8"
-                        value="9"
-                      >
-                        9th
-                      </option>
-                      <option
-                        key="9"
-                        value="10"
-                      >
-                        10th
-                      </option>
-                      <option
-                        key="10"
-                        value="11"
-                      >
-                        11st
-                      </option>
-                      <option
-                        key="11"
-                        value="12"
-                      >
-                        12nd
-                      </option>
-                      <option
-                        key="12"
-                        value="13"
-                      >
-                        13rd
-                      </option>
-                      <option
-                        key="13"
-                        value="14"
-                      >
-                        14th
-                      </option>
-                      <option
-                        key="14"
-                        value="15"
-                      >
-                        15th
-                      </option>
-                      <option
-                        key="15"
-                        value="16"
-                      >
-                        16th
-                      </option>
-                      <option
-                        key="16"
-                        value="17"
-                      >
-                        17th
-                      </option>
-                      <option
-                        key="17"
-                        value="18"
-                      >
-                        18th
-                      </option>
-                      <option
-                        key="18"
-                        value="19"
-                      >
-                        19th
-                      </option>
-                      <option
-                        key="19"
-                        value="20"
-                      >
-                        20th
-                      </option>
-                      <option
-                        key="20"
-                        value="21"
-                      >
-                        21st
-                      </option>
-                      <option
-                        key="21"
-                        value="22"
-                      >
-                        22nd
-                      </option>
-                      <option
-                        key="22"
-                        value="23"
-                      >
-                        23rd
-                      </option>
-                      <option
-                        key="23"
-                        value="24"
-                      >
-                        24th
-                      </option>
-                      <option
-                        key="24"
-                        value="25"
-                      >
-                        25th
-                      </option>
-                      <option
-                        key="25"
-                        value="26"
-                      >
-                        26th
-                      </option>
-                      <option
-                        key="26"
-                        value="27"
-                      >
-                        27th
-                      </option>
-                      <option
-                        key="27"
-                        value="28"
-                      >
-                        28th
-                      </option>
-                      <option
-                        key="28"
-                        value="29"
-                      >
-                        29th
-                      </option>
-                      <option
-                        key="29"
-                        value="30"
-                      >
-                        30th
-                      </option>
-                      <option
-                        key="30"
-                        value="31"
-                      >
-                        31st
-                      </option>
-                    </select>
-                  </EuiValidatableControl>
-                  <EuiFormControlLayoutIcons
-                    compressed={false}
-                    isDropdown={true}
-                    isLoading={false}
-                  >
-                    <div
-                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                    >
-                      <EuiFormControlLayoutCustomIcon
-                        size="m"
-                        type="arrowDown"
-                      >
-                        <span
-                          className="euiFormControlLayoutCustomIcon"
-                        >
-                          <EuiIcon
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            size="m"
-                            type="arrowDown"
-                          >
-                            <span
-                              aria-hidden="true"
-                              className="euiFormControlLayoutCustomIcon__icon"
-                              data-euiicon-type="arrowDown"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                      </EuiFormControlLayoutCustomIcon>
-                    </div>
-                  </EuiFormControlLayoutIcons>
-                </div>
-              </div>
-            </EuiFormControlLayout>
-          </EuiSelect>
-        </div>
-      </div>
-    </EuiFormRow>
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Time"
-          id="esUi.cronEditor.cronMonthly.fieldTimeLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
-    >
-      <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
-      >
-        <div
-          className="euiFormRow__labelWrapper"
-        >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
-          >
-            <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Time"
-                id="esUi.cronEditor.cronMonthly.fieldTimeLabel"
-                values={Object {}}
-              >
-                Time
-              </FormattedMessage>
-            </label>
-          </EuiFormLabel>
-        </div>
-        <div
-          className="euiFormRow__fieldWrapper"
-        >
-          <EuiFlexGroup
-            gutterSize="xs"
-            id="generated-id"
-            onBlur={[Function]}
-            onFocus={[Function]}
+              minute
+            </option>
+            <option
+              value="HOUR"
+            >
+              hour
+            </option>
+            <option
+              value="DAY"
+            >
+              day
+            </option>
+            <option
+              value="WEEK"
+            >
+              week
+            </option>
+            <option
+              value="MONTH"
+            >
+              month
+            </option>
+            <option
+              value="YEAR"
+            >
+              year
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
           >
-            <div
-              className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
-              id="generated-id"
-              onBlur={[Function]}
-              onFocus={[Function]}
+            <span
+              class="euiFormControlLayoutCustomIcon"
             >
-              <EuiFlexItem
-                grow={false}
-              >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiSelect
-                    aria-label="Hour"
-                    data-test-subj="cronFrequencyMonthlyHourSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                      ]
-                    }
-                    prepend="At"
-                    value="*"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend="At"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            At
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Hour"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyMonthlyHourSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="*"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <div
-                  className="euiFlexItem"
-                >
-                  <EuiSelect
-                    aria-label="Minute"
-                    data-test-subj="cronFrequencyMonthlyMinuteSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                        Object {
-                          "text": "24",
-                          "value": "24",
-                        },
-                        Object {
-                          "text": "25",
-                          "value": "25",
-                        },
-                        Object {
-                          "text": "26",
-                          "value": "26",
-                        },
-                        Object {
-                          "text": "27",
-                          "value": "27",
-                        },
-                        Object {
-                          "text": "28",
-                          "value": "28",
-                        },
-                        Object {
-                          "text": "29",
-                          "value": "29",
-                        },
-                        Object {
-                          "text": "30",
-                          "value": "30",
-                        },
-                        Object {
-                          "text": "31",
-                          "value": "31",
-                        },
-                        Object {
-                          "text": "32",
-                          "value": "32",
-                        },
-                        Object {
-                          "text": "33",
-                          "value": "33",
-                        },
-                        Object {
-                          "text": "34",
-                          "value": "34",
-                        },
-                        Object {
-                          "text": "35",
-                          "value": "35",
-                        },
-                        Object {
-                          "text": "36",
-                          "value": "36",
-                        },
-                        Object {
-                          "text": "37",
-                          "value": "37",
-                        },
-                        Object {
-                          "text": "38",
-                          "value": "38",
-                        },
-                        Object {
-                          "text": "39",
-                          "value": "39",
-                        },
-                        Object {
-                          "text": "40",
-                          "value": "40",
-                        },
-                        Object {
-                          "text": "41",
-                          "value": "41",
-                        },
-                        Object {
-                          "text": "42",
-                          "value": "42",
-                        },
-                        Object {
-                          "text": "43",
-                          "value": "43",
-                        },
-                        Object {
-                          "text": "44",
-                          "value": "44",
-                        },
-                        Object {
-                          "text": "45",
-                          "value": "45",
-                        },
-                        Object {
-                          "text": "46",
-                          "value": "46",
-                        },
-                        Object {
-                          "text": "47",
-                          "value": "47",
-                        },
-                        Object {
-                          "text": "48",
-                          "value": "48",
-                        },
-                        Object {
-                          "text": "49",
-                          "value": "49",
-                        },
-                        Object {
-                          "text": "50",
-                          "value": "50",
-                        },
-                        Object {
-                          "text": "51",
-                          "value": "51",
-                        },
-                        Object {
-                          "text": "52",
-                          "value": "52",
-                        },
-                        Object {
-                          "text": "53",
-                          "value": "53",
-                        },
-                        Object {
-                          "text": "54",
-                          "value": "54",
-                        },
-                        Object {
-                          "text": "55",
-                          "value": "55",
-                        },
-                        Object {
-                          "text": "56",
-                          "value": "56",
-                        },
-                        Object {
-                          "text": "57",
-                          "value": "57",
-                        },
-                        Object {
-                          "text": "58",
-                          "value": "58",
-                        },
-                        Object {
-                          "text": "59",
-                          "value": "59",
-                        },
-                      ]
-                    }
-                    prepend=":"
-                    value="10"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend=":"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            :
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Minute"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyMonthlyMinuteSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="10"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                              <option
-                                key="24"
-                                value="24"
-                              >
-                                24
-                              </option>
-                              <option
-                                key="25"
-                                value="25"
-                              >
-                                25
-                              </option>
-                              <option
-                                key="26"
-                                value="26"
-                              >
-                                26
-                              </option>
-                              <option
-                                key="27"
-                                value="27"
-                              >
-                                27
-                              </option>
-                              <option
-                                key="28"
-                                value="28"
-                              >
-                                28
-                              </option>
-                              <option
-                                key="29"
-                                value="29"
-                              >
-                                29
-                              </option>
-                              <option
-                                key="30"
-                                value="30"
-                              >
-                                30
-                              </option>
-                              <option
-                                key="31"
-                                value="31"
-                              >
-                                31
-                              </option>
-                              <option
-                                key="32"
-                                value="32"
-                              >
-                                32
-                              </option>
-                              <option
-                                key="33"
-                                value="33"
-                              >
-                                33
-                              </option>
-                              <option
-                                key="34"
-                                value="34"
-                              >
-                                34
-                              </option>
-                              <option
-                                key="35"
-                                value="35"
-                              >
-                                35
-                              </option>
-                              <option
-                                key="36"
-                                value="36"
-                              >
-                                36
-                              </option>
-                              <option
-                                key="37"
-                                value="37"
-                              >
-                                37
-                              </option>
-                              <option
-                                key="38"
-                                value="38"
-                              >
-                                38
-                              </option>
-                              <option
-                                key="39"
-                                value="39"
-                              >
-                                39
-                              </option>
-                              <option
-                                key="40"
-                                value="40"
-                              >
-                                40
-                              </option>
-                              <option
-                                key="41"
-                                value="41"
-                              >
-                                41
-                              </option>
-                              <option
-                                key="42"
-                                value="42"
-                              >
-                                42
-                              </option>
-                              <option
-                                key="43"
-                                value="43"
-                              >
-                                43
-                              </option>
-                              <option
-                                key="44"
-                                value="44"
-                              >
-                                44
-                              </option>
-                              <option
-                                key="45"
-                                value="45"
-                              >
-                                45
-                              </option>
-                              <option
-                                key="46"
-                                value="46"
-                              >
-                                46
-                              </option>
-                              <option
-                                key="47"
-                                value="47"
-                              >
-                                47
-                              </option>
-                              <option
-                                key="48"
-                                value="48"
-                              >
-                                48
-                              </option>
-                              <option
-                                key="49"
-                                value="49"
-                              >
-                                49
-                              </option>
-                              <option
-                                key="50"
-                                value="50"
-                              >
-                                50
-                              </option>
-                              <option
-                                key="51"
-                                value="51"
-                              >
-                                51
-                              </option>
-                              <option
-                                key="52"
-                                value="52"
-                              >
-                                52
-                              </option>
-                              <option
-                                key="53"
-                                value="53"
-                              >
-                                53
-                              </option>
-                              <option
-                                key="54"
-                                value="54"
-                              >
-                                54
-                              </option>
-                              <option
-                                key="55"
-                                value="55"
-                              >
-                                55
-                              </option>
-                              <option
-                                key="56"
-                                value="56"
-                              >
-                                56
-                              </option>
-                              <option
-                                key="57"
-                                value="57"
-                              >
-                                57
-                              </option>
-                              <option
-                                key="58"
-                                value="58"
-                              >
-                                58
-                              </option>
-                              <option
-                                key="59"
-                                value="59"
-                              >
-                                59
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
-            </div>
-          </EuiFlexGroup>
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
         </div>
       </div>
-    </EuiFormRow>
-  </CronMonthly>
-</CronEditor>
-`;
-
-exports[`CronEditor is rendered with a WEEK frequency 1`] = `
-<CronEditor
-  cronExpression="0 10 * * * ?"
-  fieldToPreferredValueMap={Object {}}
-  frequency="WEEK"
-  onChange={[Function]}
->
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={true}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label={
-      <FormattedMessage
-        defaultMessage="Frequency"
-        id="esUi.cronEditor.fieldFrequencyLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
   >
     <div
-      className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-      id="generated-id-row"
+      class="euiFormRow__labelWrapper"
     >
-      <div
-        className="euiFormRow__labelWrapper"
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
       >
-        <EuiFormLabel
-          className="euiFormRow__label"
-          htmlFor="generated-id"
-          id="generated-id-label"
-          isFocused={false}
-          type="label"
-        >
-          <label
-            className="euiFormLabel euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-          >
-            <FormattedMessage
-              defaultMessage="Frequency"
-              id="esUi.cronEditor.fieldFrequencyLabel"
-              values={Object {}}
-            >
-              Frequency
-            </FormattedMessage>
-          </label>
-        </EuiFormLabel>
-      </div>
+        Minute
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
       <div
-        className="euiFormRow__fieldWrapper"
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
       >
-        <EuiSelect
-          data-test-subj="cronFrequencySelect"
-          fullWidth={true}
-          id="generated-id"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          options={
-            Array [
-              Object {
-                "text": "minute",
-                "value": "MINUTE",
-              },
-              Object {
-                "text": "hour",
-                "value": "HOUR",
-              },
-              Object {
-                "text": "day",
-                "value": "DAY",
-              },
-              Object {
-                "text": "week",
-                "value": "WEEK",
-              },
-              Object {
-                "text": "month",
-                "value": "MONTH",
-              },
-              Object {
-                "text": "year",
-                "value": "YEAR",
-              },
-            ]
-          }
-          prepend="Every"
-          value="WEEK"
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
+        >
+          At
+        </label>
+        <div
+          class="euiFormControlLayout__childrenWrapper"
         >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={true}
-            inputId="generated-id"
-            isDropdown={true}
-            isLoading={false}
-            prepend="Every"
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencyHourlyMinuteSelect"
+            id="generated-id"
           >
-            <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+            <option
+              value="0"
             >
-              <EuiFormLabel
-                className="euiFormControlLayout__prepend"
-                htmlFor="generated-id"
+              00
+            </option>
+            <option
+              value="1"
+            >
+              01
+            </option>
+            <option
+              value="2"
+            >
+              02
+            </option>
+            <option
+              value="3"
+            >
+              03
+            </option>
+            <option
+              value="4"
+            >
+              04
+            </option>
+            <option
+              value="5"
+            >
+              05
+            </option>
+            <option
+              value="6"
+            >
+              06
+            </option>
+            <option
+              value="7"
+            >
+              07
+            </option>
+            <option
+              value="8"
+            >
+              08
+            </option>
+            <option
+              value="9"
+            >
+              09
+            </option>
+            <option
+              value="10"
+            >
+              10
+            </option>
+            <option
+              value="11"
+            >
+              11
+            </option>
+            <option
+              value="12"
+            >
+              12
+            </option>
+            <option
+              value="13"
+            >
+              13
+            </option>
+            <option
+              value="14"
+            >
+              14
+            </option>
+            <option
+              value="15"
+            >
+              15
+            </option>
+            <option
+              value="16"
+            >
+              16
+            </option>
+            <option
+              value="17"
+            >
+              17
+            </option>
+            <option
+              value="18"
+            >
+              18
+            </option>
+            <option
+              value="19"
+            >
+              19
+            </option>
+            <option
+              value="20"
+            >
+              20
+            </option>
+            <option
+              value="21"
+            >
+              21
+            </option>
+            <option
+              value="22"
+            >
+              22
+            </option>
+            <option
+              value="23"
+            >
+              23
+            </option>
+            <option
+              value="24"
+            >
+              24
+            </option>
+            <option
+              value="25"
+            >
+              25
+            </option>
+            <option
+              value="26"
+            >
+              26
+            </option>
+            <option
+              value="27"
+            >
+              27
+            </option>
+            <option
+              value="28"
+            >
+              28
+            </option>
+            <option
+              value="29"
+            >
+              29
+            </option>
+            <option
+              value="30"
+            >
+              30
+            </option>
+            <option
+              value="31"
+            >
+              31
+            </option>
+            <option
+              value="32"
+            >
+              32
+            </option>
+            <option
+              value="33"
+            >
+              33
+            </option>
+            <option
+              value="34"
+            >
+              34
+            </option>
+            <option
+              value="35"
+            >
+              35
+            </option>
+            <option
+              value="36"
+            >
+              36
+            </option>
+            <option
+              value="37"
+            >
+              37
+            </option>
+            <option
+              value="38"
+            >
+              38
+            </option>
+            <option
+              value="39"
+            >
+              39
+            </option>
+            <option
+              value="40"
+            >
+              40
+            </option>
+            <option
+              value="41"
+            >
+              41
+            </option>
+            <option
+              value="42"
+            >
+              42
+            </option>
+            <option
+              value="43"
+            >
+              43
+            </option>
+            <option
+              value="44"
+            >
+              44
+            </option>
+            <option
+              value="45"
+            >
+              45
+            </option>
+            <option
+              value="46"
+            >
+              46
+            </option>
+            <option
+              value="47"
+            >
+              47
+            </option>
+            <option
+              value="48"
+            >
+              48
+            </option>
+            <option
+              value="49"
+            >
+              49
+            </option>
+            <option
+              value="50"
+            >
+              50
+            </option>
+            <option
+              value="51"
+            >
+              51
+            </option>
+            <option
+              value="52"
+            >
+              52
+            </option>
+            <option
+              value="53"
+            >
+              53
+            </option>
+            <option
+              value="54"
+            >
+              54
+            </option>
+            <option
+              value="55"
+            >
+              55
+            </option>
+            <option
+              value="56"
+            >
+              56
+            </option>
+            <option
+              value="57"
+            >
+              57
+            </option>
+            <option
+              value="58"
+            >
+              58
+            </option>
+            <option
+              value="59"
+            >
+              59
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+]
+`;
+
+exports[`CronEditor is rendered with a MINUTE frequency 1`] = `
+<div
+  class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+  id="generated-id-row"
+>
+  <div
+    class="euiFormRow__labelWrapper"
+  >
+    <label
+      class="euiFormLabel euiFormRow__label"
+      for="generated-id"
+      id="generated-id-label"
+    >
+      Frequency
+    </label>
+  </div>
+  <div
+    class="euiFormRow__fieldWrapper"
+  >
+    <div
+      class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+    >
+      <label
+        class="euiFormLabel euiFormControlLayout__prepend"
+        for="generated-id"
+      >
+        Every
+      </label>
+      <div
+        class="euiFormControlLayout__childrenWrapper"
+      >
+        <select
+          class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+          data-test-subj="cronFrequencySelect"
+          id="generated-id"
+        >
+          <option
+            value="MINUTE"
+          >
+            minute
+          </option>
+          <option
+            value="HOUR"
+          >
+            hour
+          </option>
+          <option
+            value="DAY"
+          >
+            day
+          </option>
+          <option
+            value="WEEK"
+          >
+            week
+          </option>
+          <option
+            value="MONTH"
+          >
+            month
+          </option>
+          <option
+            value="YEAR"
+          >
+            year
+          </option>
+        </select>
+        <div
+          class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+        >
+          <span
+            class="euiFormControlLayoutCustomIcon"
+          >
+            <span
+              aria-hidden="true"
+              class="euiFormControlLayoutCustomIcon__icon"
+              data-euiicon-type="arrowDown"
+            />
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`CronEditor is rendered with a MONTH frequency 1`] = `
+Array [
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Frequency
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
+      <div
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+      >
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
+        >
+          Every
+        </label>
+        <div
+          class="euiFormControlLayout__childrenWrapper"
+        >
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencySelect"
+            id="generated-id"
+          >
+            <option
+              value="MINUTE"
+            >
+              minute
+            </option>
+            <option
+              value="HOUR"
+            >
+              hour
+            </option>
+            <option
+              value="DAY"
+            >
+              day
+            </option>
+            <option
+              value="WEEK"
+            >
+              week
+            </option>
+            <option
+              value="MONTH"
+            >
+              month
+            </option>
+            <option
+              value="YEAR"
+            >
+              year
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Date
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
+      <div
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+      >
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
+        >
+          On the
+        </label>
+        <div
+          class="euiFormControlLayout__childrenWrapper"
+        >
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencyMonthlyDateSelect"
+            id="generated-id"
+          >
+            <option
+              value="1"
+            >
+              1st
+            </option>
+            <option
+              value="2"
+            >
+              2nd
+            </option>
+            <option
+              value="3"
+            >
+              3rd
+            </option>
+            <option
+              value="4"
+            >
+              4th
+            </option>
+            <option
+              value="5"
+            >
+              5th
+            </option>
+            <option
+              value="6"
+            >
+              6th
+            </option>
+            <option
+              value="7"
+            >
+              7th
+            </option>
+            <option
+              value="8"
+            >
+              8th
+            </option>
+            <option
+              value="9"
+            >
+              9th
+            </option>
+            <option
+              value="10"
+            >
+              10th
+            </option>
+            <option
+              value="11"
+            >
+              11st
+            </option>
+            <option
+              value="12"
+            >
+              12nd
+            </option>
+            <option
+              value="13"
+            >
+              13rd
+            </option>
+            <option
+              value="14"
+            >
+              14th
+            </option>
+            <option
+              value="15"
+            >
+              15th
+            </option>
+            <option
+              value="16"
+            >
+              16th
+            </option>
+            <option
+              value="17"
+            >
+              17th
+            </option>
+            <option
+              value="18"
+            >
+              18th
+            </option>
+            <option
+              value="19"
+            >
+              19th
+            </option>
+            <option
+              value="20"
+            >
+              20th
+            </option>
+            <option
+              value="21"
+            >
+              21st
+            </option>
+            <option
+              value="22"
+            >
+              22nd
+            </option>
+            <option
+              value="23"
+            >
+              23rd
+            </option>
+            <option
+              value="24"
+            >
+              24th
+            </option>
+            <option
+              value="25"
+            >
+              25th
+            </option>
+            <option
+              value="26"
+            >
+              26th
+            </option>
+            <option
+              value="27"
+            >
+              27th
+            </option>
+            <option
+              value="28"
+            >
+              28th
+            </option>
+            <option
+              value="29"
+            >
+              29th
+            </option>
+            <option
+              value="30"
+            >
+              30th
+            </option>
+            <option
+              value="31"
+            >
+              31st
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Time
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
+      <div
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-stretch-row"
+        id="generated-id"
+      >
+        <div
+          class="euiFlexItem emotion-euiFlexItem-growZero"
+        >
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+          >
+            <label
+              class="euiFormLabel euiFormControlLayout__prepend"
+            >
+              At
+            </label>
+            <div
+              class="euiFormControlLayout__childrenWrapper"
+            >
+              <select
+                aria-label="Hour"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyMonthlyHourSelect"
+              >
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
+                >
+                  08
+                </option>
+                <option
+                  value="9"
+                >
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+              </select>
+              <div
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+              >
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
+        >
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+          >
+            <label
+              class="euiFormLabel euiFormControlLayout__prepend"
+            >
+              :
+            </label>
+            <div
+              class="euiFormControlLayout__childrenWrapper"
+            >
+              <select
+                aria-label="Minute"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyMonthlyMinuteSelect"
+              >
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
+                >
+                  08
+                </option>
+                <option
+                  value="9"
+                >
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+                <option
+                  value="24"
+                >
+                  24
+                </option>
+                <option
+                  value="25"
+                >
+                  25
+                </option>
+                <option
+                  value="26"
+                >
+                  26
+                </option>
+                <option
+                  value="27"
+                >
+                  27
+                </option>
+                <option
+                  value="28"
+                >
+                  28
+                </option>
+                <option
+                  value="29"
+                >
+                  29
+                </option>
+                <option
+                  value="30"
+                >
+                  30
+                </option>
+                <option
+                  value="31"
+                >
+                  31
+                </option>
+                <option
+                  value="32"
+                >
+                  32
+                </option>
+                <option
+                  value="33"
+                >
+                  33
+                </option>
+                <option
+                  value="34"
+                >
+                  34
+                </option>
+                <option
+                  value="35"
+                >
+                  35
+                </option>
+                <option
+                  value="36"
+                >
+                  36
+                </option>
+                <option
+                  value="37"
+                >
+                  37
+                </option>
+                <option
+                  value="38"
+                >
+                  38
+                </option>
+                <option
+                  value="39"
+                >
+                  39
+                </option>
+                <option
+                  value="40"
+                >
+                  40
+                </option>
+                <option
+                  value="41"
+                >
+                  41
+                </option>
+                <option
+                  value="42"
+                >
+                  42
+                </option>
+                <option
+                  value="43"
+                >
+                  43
+                </option>
+                <option
+                  value="44"
+                >
+                  44
+                </option>
+                <option
+                  value="45"
+                >
+                  45
+                </option>
+                <option
+                  value="46"
+                >
+                  46
+                </option>
+                <option
+                  value="47"
+                >
+                  47
+                </option>
+                <option
+                  value="48"
+                >
+                  48
+                </option>
+                <option
+                  value="49"
+                >
+                  49
+                </option>
+                <option
+                  value="50"
+                >
+                  50
+                </option>
+                <option
+                  value="51"
+                >
+                  51
+                </option>
+                <option
+                  value="52"
+                >
+                  52
+                </option>
+                <option
+                  value="53"
+                >
+                  53
+                </option>
+                <option
+                  value="54"
+                >
+                  54
+                </option>
+                <option
+                  value="55"
+                >
+                  55
+                </option>
+                <option
+                  value="56"
+                >
+                  56
+                </option>
+                <option
+                  value="57"
+                >
+                  57
+                </option>
+                <option
+                  value="58"
+                >
+                  58
+                </option>
+                <option
+                  value="59"
+                >
+                  59
+                </option>
+              </select>
+              <div
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
               >
-                <label
-                  className="euiFormLabel euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+]
+`;
+
+exports[`CronEditor is rendered with a WEEK frequency 1`] = `
+Array [
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Frequency
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
+      <div
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+      >
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
+        >
+          Every
+        </label>
+        <div
+          class="euiFormControlLayout__childrenWrapper"
+        >
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencySelect"
+            id="generated-id"
+          >
+            <option
+              value="MINUTE"
+            >
+              minute
+            </option>
+            <option
+              value="HOUR"
+            >
+              hour
+            </option>
+            <option
+              value="DAY"
+            >
+              day
+            </option>
+            <option
+              value="WEEK"
+            >
+              week
+            </option>
+            <option
+              value="MONTH"
+            >
+              month
+            </option>
+            <option
+              value="YEAR"
+            >
+              year
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Day
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
+      <div
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+      >
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
+        >
+          On
+        </label>
+        <div
+          class="euiFormControlLayout__childrenWrapper"
+        >
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencyWeeklyDaySelect"
+            id="generated-id"
+          >
+            <option
+              value="1"
+            >
+              Sunday
+            </option>
+            <option
+              value="2"
+            >
+              Monday
+            </option>
+            <option
+              value="3"
+            >
+              Tuesday
+            </option>
+            <option
+              value="4"
+            >
+              Wednesday
+            </option>
+            <option
+              value="5"
+            >
+              Thursday
+            </option>
+            <option
+              value="6"
+            >
+              Friday
+            </option>
+            <option
+              value="7"
+            >
+              Saturday
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Time
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
+    >
+      <div
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-stretch-row"
+        id="generated-id"
+      >
+        <div
+          class="euiFlexItem emotion-euiFlexItem-growZero"
+        >
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+          >
+            <label
+              class="euiFormLabel euiFormControlLayout__prepend"
+            >
+              At
+            </label>
+            <div
+              class="euiFormControlLayout__childrenWrapper"
+            >
+              <select
+                aria-label="Hour"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyWeeklyHourSelect"
+              >
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
+                >
+                  08
+                </option>
+                <option
+                  value="9"
+                >
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+              </select>
+              <div
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+              >
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
+        >
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+          >
+            <label
+              class="euiFormLabel euiFormControlLayout__prepend"
+            >
+              :
+            </label>
+            <div
+              class="euiFormControlLayout__childrenWrapper"
+            >
+              <select
+                aria-label="Minute"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyWeeklyMinuteSelect"
+              >
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
+                >
+                  08
+                </option>
+                <option
+                  value="9"
+                >
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+                <option
+                  value="24"
+                >
+                  24
+                </option>
+                <option
+                  value="25"
+                >
+                  25
+                </option>
+                <option
+                  value="26"
+                >
+                  26
+                </option>
+                <option
+                  value="27"
+                >
+                  27
+                </option>
+                <option
+                  value="28"
+                >
+                  28
+                </option>
+                <option
+                  value="29"
+                >
+                  29
+                </option>
+                <option
+                  value="30"
+                >
+                  30
+                </option>
+                <option
+                  value="31"
+                >
+                  31
+                </option>
+                <option
+                  value="32"
+                >
+                  32
+                </option>
+                <option
+                  value="33"
+                >
+                  33
+                </option>
+                <option
+                  value="34"
+                >
+                  34
+                </option>
+                <option
+                  value="35"
+                >
+                  35
+                </option>
+                <option
+                  value="36"
+                >
+                  36
+                </option>
+                <option
+                  value="37"
+                >
+                  37
+                </option>
+                <option
+                  value="38"
+                >
+                  38
+                </option>
+                <option
+                  value="39"
+                >
+                  39
+                </option>
+                <option
+                  value="40"
+                >
+                  40
+                </option>
+                <option
+                  value="41"
+                >
+                  41
+                </option>
+                <option
+                  value="42"
+                >
+                  42
+                </option>
+                <option
+                  value="43"
+                >
+                  43
+                </option>
+                <option
+                  value="44"
+                >
+                  44
+                </option>
+                <option
+                  value="45"
+                >
+                  45
+                </option>
+                <option
+                  value="46"
+                >
+                  46
+                </option>
+                <option
+                  value="47"
+                >
+                  47
+                </option>
+                <option
+                  value="48"
                 >
-                  Every
-                </label>
-              </EuiFormLabel>
+                  48
+                </option>
+                <option
+                  value="49"
+                >
+                  49
+                </option>
+                <option
+                  value="50"
+                >
+                  50
+                </option>
+                <option
+                  value="51"
+                >
+                  51
+                </option>
+                <option
+                  value="52"
+                >
+                  52
+                </option>
+                <option
+                  value="53"
+                >
+                  53
+                </option>
+                <option
+                  value="54"
+                >
+                  54
+                </option>
+                <option
+                  value="55"
+                >
+                  55
+                </option>
+                <option
+                  value="56"
+                >
+                  56
+                </option>
+                <option
+                  value="57"
+                >
+                  57
+                </option>
+                <option
+                  value="58"
+                >
+                  58
+                </option>
+                <option
+                  value="59"
+                >
+                  59
+                </option>
+              </select>
               <div
-                className="euiFormControlLayout__childrenWrapper"
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
               >
-                <EuiValidatableControl>
-                  <select
-                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                    data-test-subj="cronFrequencySelect"
-                    id="generated-id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="WEEK"
-                  >
-                    <option
-                      key="0"
-                      value="MINUTE"
-                    >
-                      minute
-                    </option>
-                    <option
-                      key="1"
-                      value="HOUR"
-                    >
-                      hour
-                    </option>
-                    <option
-                      key="2"
-                      value="DAY"
-                    >
-                      day
-                    </option>
-                    <option
-                      key="3"
-                      value="WEEK"
-                    >
-                      week
-                    </option>
-                    <option
-                      key="4"
-                      value="MONTH"
-                    >
-                      month
-                    </option>
-                    <option
-                      key="5"
-                      value="YEAR"
-                    >
-                      year
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  isDropdown={true}
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                  >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
-                    >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
-                      >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
-                        >
-                          <span
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            data-euiicon-type="arrowDown"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
               </div>
             </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
+          </div>
+        </div>
       </div>
     </div>
-  </EuiFormRow>
-  <CronWeekly
-    day="?"
-    dayOptions={
-      Array [
-        Object {
-          "text": "Sunday",
-          "value": "1",
-        },
-        Object {
-          "text": "Monday",
-          "value": "2",
-        },
-        Object {
-          "text": "Tuesday",
-          "value": "3",
-        },
-        Object {
-          "text": "Wednesday",
-          "value": "4",
-        },
-        Object {
-          "text": "Thursday",
-          "value": "5",
-        },
-        Object {
-          "text": "Friday",
-          "value": "6",
-        },
-        Object {
-          "text": "Saturday",
-          "value": "7",
-        },
-      ]
-    }
-    hour="*"
-    hourOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-      ]
-    }
-    minute="10"
-    minuteOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-        Object {
-          "text": "24",
-          "value": "24",
-        },
-        Object {
-          "text": "25",
-          "value": "25",
-        },
-        Object {
-          "text": "26",
-          "value": "26",
-        },
-        Object {
-          "text": "27",
-          "value": "27",
-        },
-        Object {
-          "text": "28",
-          "value": "28",
-        },
-        Object {
-          "text": "29",
-          "value": "29",
-        },
-        Object {
-          "text": "30",
-          "value": "30",
-        },
-        Object {
-          "text": "31",
-          "value": "31",
-        },
-        Object {
-          "text": "32",
-          "value": "32",
-        },
-        Object {
-          "text": "33",
-          "value": "33",
-        },
-        Object {
-          "text": "34",
-          "value": "34",
-        },
-        Object {
-          "text": "35",
-          "value": "35",
-        },
-        Object {
-          "text": "36",
-          "value": "36",
-        },
-        Object {
-          "text": "37",
-          "value": "37",
-        },
-        Object {
-          "text": "38",
-          "value": "38",
-        },
-        Object {
-          "text": "39",
-          "value": "39",
-        },
-        Object {
-          "text": "40",
-          "value": "40",
-        },
-        Object {
-          "text": "41",
-          "value": "41",
-        },
-        Object {
-          "text": "42",
-          "value": "42",
-        },
-        Object {
-          "text": "43",
-          "value": "43",
-        },
-        Object {
-          "text": "44",
-          "value": "44",
-        },
-        Object {
-          "text": "45",
-          "value": "45",
-        },
-        Object {
-          "text": "46",
-          "value": "46",
-        },
-        Object {
-          "text": "47",
-          "value": "47",
-        },
-        Object {
-          "text": "48",
-          "value": "48",
-        },
-        Object {
-          "text": "49",
-          "value": "49",
-        },
-        Object {
-          "text": "50",
-          "value": "50",
-        },
-        Object {
-          "text": "51",
-          "value": "51",
-        },
-        Object {
-          "text": "52",
-          "value": "52",
-        },
-        Object {
-          "text": "53",
-          "value": "53",
-        },
-        Object {
-          "text": "54",
-          "value": "54",
-        },
-        Object {
-          "text": "55",
-          "value": "55",
-        },
-        Object {
-          "text": "56",
-          "value": "56",
-        },
-        Object {
-          "text": "57",
-          "value": "57",
-        },
-        Object {
-          "text": "58",
-          "value": "58",
-        },
-        Object {
-          "text": "59",
-          "value": "59",
-        },
-      ]
-    }
-    onChange={[Function]}
+  </div>,
+]
+`;
+
+exports[`CronEditor is rendered with a YEAR frequency 1`] = `
+Array [
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    id="generated-id-row"
   >
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Day"
-          id="esUi.cronEditor.cronWeekly.fieldDateLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Frequency
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
       >
-        <div
-          className="euiFormRow__labelWrapper"
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
         >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
-          >
-            <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Day"
-                id="esUi.cronEditor.cronWeekly.fieldDateLabel"
-                values={Object {}}
-              >
-                Day
-              </FormattedMessage>
-            </label>
-          </EuiFormLabel>
-        </div>
+          Every
+        </label>
         <div
-          className="euiFormRow__fieldWrapper"
+          class="euiFormControlLayout__childrenWrapper"
         >
-          <EuiSelect
-            data-test-subj="cronFrequencyWeeklyDaySelect"
-            fullWidth={true}
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencySelect"
             id="generated-id"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            options={
-              Array [
-                Object {
-                  "text": "Sunday",
-                  "value": "1",
-                },
-                Object {
-                  "text": "Monday",
-                  "value": "2",
-                },
-                Object {
-                  "text": "Tuesday",
-                  "value": "3",
-                },
-                Object {
-                  "text": "Wednesday",
-                  "value": "4",
-                },
-                Object {
-                  "text": "Thursday",
-                  "value": "5",
-                },
-                Object {
-                  "text": "Friday",
-                  "value": "6",
-                },
-                Object {
-                  "text": "Saturday",
-                  "value": "7",
-                },
-              ]
-            }
-            prepend="On"
-            value="?"
           >
-            <EuiFormControlLayout
-              compressed={false}
-              fullWidth={true}
-              inputId="generated-id"
-              isDropdown={true}
-              isLoading={false}
-              prepend="On"
+            <option
+              value="MINUTE"
             >
-              <div
-                className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-              >
-                <EuiFormLabel
-                  className="euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  <label
-                    className="euiFormLabel euiFormControlLayout__prepend"
-                    htmlFor="generated-id"
-                  >
-                    On
-                  </label>
-                </EuiFormLabel>
-                <div
-                  className="euiFormControlLayout__childrenWrapper"
-                >
-                  <EuiValidatableControl>
-                    <select
-                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                      data-test-subj="cronFrequencyWeeklyDaySelect"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      onMouseUp={[Function]}
-                      value="?"
-                    >
-                      <option
-                        key="0"
-                        value="1"
-                      >
-                        Sunday
-                      </option>
-                      <option
-                        key="1"
-                        value="2"
-                      >
-                        Monday
-                      </option>
-                      <option
-                        key="2"
-                        value="3"
-                      >
-                        Tuesday
-                      </option>
-                      <option
-                        key="3"
-                        value="4"
-                      >
-                        Wednesday
-                      </option>
-                      <option
-                        key="4"
-                        value="5"
-                      >
-                        Thursday
-                      </option>
-                      <option
-                        key="5"
-                        value="6"
-                      >
-                        Friday
-                      </option>
-                      <option
-                        key="6"
-                        value="7"
-                      >
-                        Saturday
-                      </option>
-                    </select>
-                  </EuiValidatableControl>
-                  <EuiFormControlLayoutIcons
-                    compressed={false}
-                    isDropdown={true}
-                    isLoading={false}
-                  >
-                    <div
-                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                    >
-                      <EuiFormControlLayoutCustomIcon
-                        size="m"
-                        type="arrowDown"
-                      >
-                        <span
-                          className="euiFormControlLayoutCustomIcon"
-                        >
-                          <EuiIcon
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            size="m"
-                            type="arrowDown"
-                          >
-                            <span
-                              aria-hidden="true"
-                              className="euiFormControlLayoutCustomIcon__icon"
-                              data-euiicon-type="arrowDown"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                      </EuiFormControlLayoutCustomIcon>
-                    </div>
-                  </EuiFormControlLayoutIcons>
-                </div>
-              </div>
-            </EuiFormControlLayout>
-          </EuiSelect>
+              minute
+            </option>
+            <option
+              value="HOUR"
+            >
+              hour
+            </option>
+            <option
+              value="DAY"
+            >
+              day
+            </option>
+            <option
+              value="WEEK"
+            >
+              week
+            </option>
+            <option
+              value="MONTH"
+            >
+              month
+            </option>
+            <option
+              value="YEAR"
+            >
+              year
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
         </div>
       </div>
-    </EuiFormRow>
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Time"
-          id="esUi.cronEditor.cronWeekly.fieldTimeLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Month
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
       >
-        <div
-          className="euiFormRow__labelWrapper"
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
         >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
-          >
-            <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Time"
-                id="esUi.cronEditor.cronWeekly.fieldTimeLabel"
-                values={Object {}}
-              >
-                Time
-              </FormattedMessage>
-            </label>
-          </EuiFormLabel>
-        </div>
+          In
+        </label>
         <div
-          className="euiFormRow__fieldWrapper"
+          class="euiFormControlLayout__childrenWrapper"
         >
-          <EuiFlexGroup
-            gutterSize="xs"
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencyYearlyMonthSelect"
             id="generated-id"
-            onBlur={[Function]}
-            onFocus={[Function]}
           >
-            <div
-              className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
-              id="generated-id"
-              onBlur={[Function]}
-              onFocus={[Function]}
+            <option
+              value="1"
             >
-              <EuiFlexItem
-                grow={false}
-              >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiSelect
-                    aria-label="Hour"
-                    data-test-subj="cronFrequencyWeeklyHourSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                      ]
-                    }
-                    prepend="At"
-                    value="*"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend="At"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            At
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Hour"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyWeeklyHourSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="*"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <div
-                  className="euiFlexItem"
-                >
-                  <EuiSelect
-                    aria-label="Minute"
-                    data-test-subj="cronFrequencyWeeklyMinuteSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                        Object {
-                          "text": "24",
-                          "value": "24",
-                        },
-                        Object {
-                          "text": "25",
-                          "value": "25",
-                        },
-                        Object {
-                          "text": "26",
-                          "value": "26",
-                        },
-                        Object {
-                          "text": "27",
-                          "value": "27",
-                        },
-                        Object {
-                          "text": "28",
-                          "value": "28",
-                        },
-                        Object {
-                          "text": "29",
-                          "value": "29",
-                        },
-                        Object {
-                          "text": "30",
-                          "value": "30",
-                        },
-                        Object {
-                          "text": "31",
-                          "value": "31",
-                        },
-                        Object {
-                          "text": "32",
-                          "value": "32",
-                        },
-                        Object {
-                          "text": "33",
-                          "value": "33",
-                        },
-                        Object {
-                          "text": "34",
-                          "value": "34",
-                        },
-                        Object {
-                          "text": "35",
-                          "value": "35",
-                        },
-                        Object {
-                          "text": "36",
-                          "value": "36",
-                        },
-                        Object {
-                          "text": "37",
-                          "value": "37",
-                        },
-                        Object {
-                          "text": "38",
-                          "value": "38",
-                        },
-                        Object {
-                          "text": "39",
-                          "value": "39",
-                        },
-                        Object {
-                          "text": "40",
-                          "value": "40",
-                        },
-                        Object {
-                          "text": "41",
-                          "value": "41",
-                        },
-                        Object {
-                          "text": "42",
-                          "value": "42",
-                        },
-                        Object {
-                          "text": "43",
-                          "value": "43",
-                        },
-                        Object {
-                          "text": "44",
-                          "value": "44",
-                        },
-                        Object {
-                          "text": "45",
-                          "value": "45",
-                        },
-                        Object {
-                          "text": "46",
-                          "value": "46",
-                        },
-                        Object {
-                          "text": "47",
-                          "value": "47",
-                        },
-                        Object {
-                          "text": "48",
-                          "value": "48",
-                        },
-                        Object {
-                          "text": "49",
-                          "value": "49",
-                        },
-                        Object {
-                          "text": "50",
-                          "value": "50",
-                        },
-                        Object {
-                          "text": "51",
-                          "value": "51",
-                        },
-                        Object {
-                          "text": "52",
-                          "value": "52",
-                        },
-                        Object {
-                          "text": "53",
-                          "value": "53",
-                        },
-                        Object {
-                          "text": "54",
-                          "value": "54",
-                        },
-                        Object {
-                          "text": "55",
-                          "value": "55",
-                        },
-                        Object {
-                          "text": "56",
-                          "value": "56",
-                        },
-                        Object {
-                          "text": "57",
-                          "value": "57",
-                        },
-                        Object {
-                          "text": "58",
-                          "value": "58",
-                        },
-                        Object {
-                          "text": "59",
-                          "value": "59",
-                        },
-                      ]
-                    }
-                    prepend=":"
-                    value="10"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend=":"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            :
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Minute"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyWeeklyMinuteSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="10"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                              <option
-                                key="24"
-                                value="24"
-                              >
-                                24
-                              </option>
-                              <option
-                                key="25"
-                                value="25"
-                              >
-                                25
-                              </option>
-                              <option
-                                key="26"
-                                value="26"
-                              >
-                                26
-                              </option>
-                              <option
-                                key="27"
-                                value="27"
-                              >
-                                27
-                              </option>
-                              <option
-                                key="28"
-                                value="28"
-                              >
-                                28
-                              </option>
-                              <option
-                                key="29"
-                                value="29"
-                              >
-                                29
-                              </option>
-                              <option
-                                key="30"
-                                value="30"
-                              >
-                                30
-                              </option>
-                              <option
-                                key="31"
-                                value="31"
-                              >
-                                31
-                              </option>
-                              <option
-                                key="32"
-                                value="32"
-                              >
-                                32
-                              </option>
-                              <option
-                                key="33"
-                                value="33"
-                              >
-                                33
-                              </option>
-                              <option
-                                key="34"
-                                value="34"
-                              >
-                                34
-                              </option>
-                              <option
-                                key="35"
-                                value="35"
-                              >
-                                35
-                              </option>
-                              <option
-                                key="36"
-                                value="36"
-                              >
-                                36
-                              </option>
-                              <option
-                                key="37"
-                                value="37"
-                              >
-                                37
-                              </option>
-                              <option
-                                key="38"
-                                value="38"
-                              >
-                                38
-                              </option>
-                              <option
-                                key="39"
-                                value="39"
-                              >
-                                39
-                              </option>
-                              <option
-                                key="40"
-                                value="40"
-                              >
-                                40
-                              </option>
-                              <option
-                                key="41"
-                                value="41"
-                              >
-                                41
-                              </option>
-                              <option
-                                key="42"
-                                value="42"
-                              >
-                                42
-                              </option>
-                              <option
-                                key="43"
-                                value="43"
-                              >
-                                43
-                              </option>
-                              <option
-                                key="44"
-                                value="44"
-                              >
-                                44
-                              </option>
-                              <option
-                                key="45"
-                                value="45"
-                              >
-                                45
-                              </option>
-                              <option
-                                key="46"
-                                value="46"
-                              >
-                                46
-                              </option>
-                              <option
-                                key="47"
-                                value="47"
-                              >
-                                47
-                              </option>
-                              <option
-                                key="48"
-                                value="48"
-                              >
-                                48
-                              </option>
-                              <option
-                                key="49"
-                                value="49"
-                              >
-                                49
-                              </option>
-                              <option
-                                key="50"
-                                value="50"
-                              >
-                                50
-                              </option>
-                              <option
-                                key="51"
-                                value="51"
-                              >
-                                51
-                              </option>
-                              <option
-                                key="52"
-                                value="52"
-                              >
-                                52
-                              </option>
-                              <option
-                                key="53"
-                                value="53"
-                              >
-                                53
-                              </option>
-                              <option
-                                key="54"
-                                value="54"
-                              >
-                                54
-                              </option>
-                              <option
-                                key="55"
-                                value="55"
-                              >
-                                55
-                              </option>
-                              <option
-                                key="56"
-                                value="56"
-                              >
-                                56
-                              </option>
-                              <option
-                                key="57"
-                                value="57"
-                              >
-                                57
-                              </option>
-                              <option
-                                key="58"
-                                value="58"
-                              >
-                                58
-                              </option>
-                              <option
-                                key="59"
-                                value="59"
-                              >
-                                59
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
-            </div>
-          </EuiFlexGroup>
+              January
+            </option>
+            <option
+              value="2"
+            >
+              February
+            </option>
+            <option
+              value="3"
+            >
+              March
+            </option>
+            <option
+              value="4"
+            >
+              April
+            </option>
+            <option
+              value="5"
+            >
+              May
+            </option>
+            <option
+              value="6"
+            >
+              June
+            </option>
+            <option
+              value="7"
+            >
+              July
+            </option>
+            <option
+              value="8"
+            >
+              August
+            </option>
+            <option
+              value="9"
+            >
+              September
+            </option>
+            <option
+              value="10"
+            >
+              October
+            </option>
+            <option
+              value="11"
+            >
+              November
+            </option>
+            <option
+              value="12"
+            >
+              December
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
         </div>
       </div>
-    </EuiFormRow>
-  </CronWeekly>
-</CronEditor>
-`;
-
-exports[`CronEditor is rendered with a YEAR frequency 1`] = `
-<CronEditor
-  cronExpression="0 10 * * * ?"
-  fieldToPreferredValueMap={Object {}}
-  frequency="YEAR"
-  onChange={[Function]}
->
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={true}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label={
-      <FormattedMessage
-        defaultMessage="Frequency"
-        id="esUi.cronEditor.fieldFrequencyLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
   >
     <div
-      className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-      id="generated-id-row"
+      class="euiFormRow__labelWrapper"
     >
-      <div
-        className="euiFormRow__labelWrapper"
-      >
-        <EuiFormLabel
-          className="euiFormRow__label"
-          htmlFor="generated-id"
-          id="generated-id-label"
-          isFocused={false}
-          type="label"
-        >
-          <label
-            className="euiFormLabel euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-          >
-            <FormattedMessage
-              defaultMessage="Frequency"
-              id="esUi.cronEditor.fieldFrequencyLabel"
-              values={Object {}}
-            >
-              Frequency
-            </FormattedMessage>
-          </label>
-        </EuiFormLabel>
-      </div>
-      <div
-        className="euiFormRow__fieldWrapper"
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
       >
-        <EuiSelect
-          data-test-subj="cronFrequencySelect"
-          fullWidth={true}
-          id="generated-id"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          options={
-            Array [
-              Object {
-                "text": "minute",
-                "value": "MINUTE",
-              },
-              Object {
-                "text": "hour",
-                "value": "HOUR",
-              },
-              Object {
-                "text": "day",
-                "value": "DAY",
-              },
-              Object {
-                "text": "week",
-                "value": "WEEK",
-              },
-              Object {
-                "text": "month",
-                "value": "MONTH",
-              },
-              Object {
-                "text": "year",
-                "value": "YEAR",
-              },
-            ]
-          }
-          prepend="Every"
-          value="YEAR"
-        >
-          <EuiFormControlLayout
-            compressed={false}
-            fullWidth={true}
-            inputId="generated-id"
-            isDropdown={true}
-            isLoading={false}
-            prepend="Every"
-          >
-            <div
-              className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-            >
-              <EuiFormLabel
-                className="euiFormControlLayout__prepend"
-                htmlFor="generated-id"
-              >
-                <label
-                  className="euiFormLabel euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  Every
-                </label>
-              </EuiFormLabel>
-              <div
-                className="euiFormControlLayout__childrenWrapper"
-              >
-                <EuiValidatableControl>
-                  <select
-                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                    data-test-subj="cronFrequencySelect"
-                    id="generated-id"
-                    onBlur={[Function]}
-                    onChange={[Function]}
-                    onFocus={[Function]}
-                    onMouseUp={[Function]}
-                    value="YEAR"
-                  >
-                    <option
-                      key="0"
-                      value="MINUTE"
-                    >
-                      minute
-                    </option>
-                    <option
-                      key="1"
-                      value="HOUR"
-                    >
-                      hour
-                    </option>
-                    <option
-                      key="2"
-                      value="DAY"
-                    >
-                      day
-                    </option>
-                    <option
-                      key="3"
-                      value="WEEK"
-                    >
-                      week
-                    </option>
-                    <option
-                      key="4"
-                      value="MONTH"
-                    >
-                      month
-                    </option>
-                    <option
-                      key="5"
-                      value="YEAR"
-                    >
-                      year
-                    </option>
-                  </select>
-                </EuiValidatableControl>
-                <EuiFormControlLayoutIcons
-                  compressed={false}
-                  isDropdown={true}
-                  isLoading={false}
-                >
-                  <div
-                    className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                  >
-                    <EuiFormControlLayoutCustomIcon
-                      size="m"
-                      type="arrowDown"
-                    >
-                      <span
-                        className="euiFormControlLayoutCustomIcon"
-                      >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiFormControlLayoutCustomIcon__icon"
-                          size="m"
-                          type="arrowDown"
-                        >
-                          <span
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            data-euiicon-type="arrowDown"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                    </EuiFormControlLayoutCustomIcon>
-                  </div>
-                </EuiFormControlLayoutIcons>
-              </div>
-            </div>
-          </EuiFormControlLayout>
-        </EuiSelect>
-      </div>
+        Date
+      </label>
     </div>
-  </EuiFormRow>
-  <CronYearly
-    date="*"
-    dateOptions={
-      Array [
-        Object {
-          "text": "1st",
-          "value": "1",
-        },
-        Object {
-          "text": "2nd",
-          "value": "2",
-        },
-        Object {
-          "text": "3rd",
-          "value": "3",
-        },
-        Object {
-          "text": "4th",
-          "value": "4",
-        },
-        Object {
-          "text": "5th",
-          "value": "5",
-        },
-        Object {
-          "text": "6th",
-          "value": "6",
-        },
-        Object {
-          "text": "7th",
-          "value": "7",
-        },
-        Object {
-          "text": "8th",
-          "value": "8",
-        },
-        Object {
-          "text": "9th",
-          "value": "9",
-        },
-        Object {
-          "text": "10th",
-          "value": "10",
-        },
-        Object {
-          "text": "11st",
-          "value": "11",
-        },
-        Object {
-          "text": "12nd",
-          "value": "12",
-        },
-        Object {
-          "text": "13rd",
-          "value": "13",
-        },
-        Object {
-          "text": "14th",
-          "value": "14",
-        },
-        Object {
-          "text": "15th",
-          "value": "15",
-        },
-        Object {
-          "text": "16th",
-          "value": "16",
-        },
-        Object {
-          "text": "17th",
-          "value": "17",
-        },
-        Object {
-          "text": "18th",
-          "value": "18",
-        },
-        Object {
-          "text": "19th",
-          "value": "19",
-        },
-        Object {
-          "text": "20th",
-          "value": "20",
-        },
-        Object {
-          "text": "21st",
-          "value": "21",
-        },
-        Object {
-          "text": "22nd",
-          "value": "22",
-        },
-        Object {
-          "text": "23rd",
-          "value": "23",
-        },
-        Object {
-          "text": "24th",
-          "value": "24",
-        },
-        Object {
-          "text": "25th",
-          "value": "25",
-        },
-        Object {
-          "text": "26th",
-          "value": "26",
-        },
-        Object {
-          "text": "27th",
-          "value": "27",
-        },
-        Object {
-          "text": "28th",
-          "value": "28",
-        },
-        Object {
-          "text": "29th",
-          "value": "29",
-        },
-        Object {
-          "text": "30th",
-          "value": "30",
-        },
-        Object {
-          "text": "31st",
-          "value": "31",
-        },
-      ]
-    }
-    hour="*"
-    hourOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-      ]
-    }
-    minute="10"
-    minuteOptions={
-      Array [
-        Object {
-          "text": "00",
-          "value": "0",
-        },
-        Object {
-          "text": "01",
-          "value": "1",
-        },
-        Object {
-          "text": "02",
-          "value": "2",
-        },
-        Object {
-          "text": "03",
-          "value": "3",
-        },
-        Object {
-          "text": "04",
-          "value": "4",
-        },
-        Object {
-          "text": "05",
-          "value": "5",
-        },
-        Object {
-          "text": "06",
-          "value": "6",
-        },
-        Object {
-          "text": "07",
-          "value": "7",
-        },
-        Object {
-          "text": "08",
-          "value": "8",
-        },
-        Object {
-          "text": "09",
-          "value": "9",
-        },
-        Object {
-          "text": "10",
-          "value": "10",
-        },
-        Object {
-          "text": "11",
-          "value": "11",
-        },
-        Object {
-          "text": "12",
-          "value": "12",
-        },
-        Object {
-          "text": "13",
-          "value": "13",
-        },
-        Object {
-          "text": "14",
-          "value": "14",
-        },
-        Object {
-          "text": "15",
-          "value": "15",
-        },
-        Object {
-          "text": "16",
-          "value": "16",
-        },
-        Object {
-          "text": "17",
-          "value": "17",
-        },
-        Object {
-          "text": "18",
-          "value": "18",
-        },
-        Object {
-          "text": "19",
-          "value": "19",
-        },
-        Object {
-          "text": "20",
-          "value": "20",
-        },
-        Object {
-          "text": "21",
-          "value": "21",
-        },
-        Object {
-          "text": "22",
-          "value": "22",
-        },
-        Object {
-          "text": "23",
-          "value": "23",
-        },
-        Object {
-          "text": "24",
-          "value": "24",
-        },
-        Object {
-          "text": "25",
-          "value": "25",
-        },
-        Object {
-          "text": "26",
-          "value": "26",
-        },
-        Object {
-          "text": "27",
-          "value": "27",
-        },
-        Object {
-          "text": "28",
-          "value": "28",
-        },
-        Object {
-          "text": "29",
-          "value": "29",
-        },
-        Object {
-          "text": "30",
-          "value": "30",
-        },
-        Object {
-          "text": "31",
-          "value": "31",
-        },
-        Object {
-          "text": "32",
-          "value": "32",
-        },
-        Object {
-          "text": "33",
-          "value": "33",
-        },
-        Object {
-          "text": "34",
-          "value": "34",
-        },
-        Object {
-          "text": "35",
-          "value": "35",
-        },
-        Object {
-          "text": "36",
-          "value": "36",
-        },
-        Object {
-          "text": "37",
-          "value": "37",
-        },
-        Object {
-          "text": "38",
-          "value": "38",
-        },
-        Object {
-          "text": "39",
-          "value": "39",
-        },
-        Object {
-          "text": "40",
-          "value": "40",
-        },
-        Object {
-          "text": "41",
-          "value": "41",
-        },
-        Object {
-          "text": "42",
-          "value": "42",
-        },
-        Object {
-          "text": "43",
-          "value": "43",
-        },
-        Object {
-          "text": "44",
-          "value": "44",
-        },
-        Object {
-          "text": "45",
-          "value": "45",
-        },
-        Object {
-          "text": "46",
-          "value": "46",
-        },
-        Object {
-          "text": "47",
-          "value": "47",
-        },
-        Object {
-          "text": "48",
-          "value": "48",
-        },
-        Object {
-          "text": "49",
-          "value": "49",
-        },
-        Object {
-          "text": "50",
-          "value": "50",
-        },
-        Object {
-          "text": "51",
-          "value": "51",
-        },
-        Object {
-          "text": "52",
-          "value": "52",
-        },
-        Object {
-          "text": "53",
-          "value": "53",
-        },
-        Object {
-          "text": "54",
-          "value": "54",
-        },
-        Object {
-          "text": "55",
-          "value": "55",
-        },
-        Object {
-          "text": "56",
-          "value": "56",
-        },
-        Object {
-          "text": "57",
-          "value": "57",
-        },
-        Object {
-          "text": "58",
-          "value": "58",
-        },
-        Object {
-          "text": "59",
-          "value": "59",
-        },
-      ]
-    }
-    month="*"
-    monthOptions={
-      Array [
-        Object {
-          "text": "January",
-          "value": "1",
-        },
-        Object {
-          "text": "February",
-          "value": "2",
-        },
-        Object {
-          "text": "March",
-          "value": "3",
-        },
-        Object {
-          "text": "April",
-          "value": "4",
-        },
-        Object {
-          "text": "May",
-          "value": "5",
-        },
-        Object {
-          "text": "June",
-          "value": "6",
-        },
-        Object {
-          "text": "July",
-          "value": "7",
-        },
-        Object {
-          "text": "August",
-          "value": "8",
-        },
-        Object {
-          "text": "September",
-          "value": "9",
-        },
-        Object {
-          "text": "October",
-          "value": "10",
-        },
-        Object {
-          "text": "November",
-          "value": "11",
-        },
-        Object {
-          "text": "December",
-          "value": "12",
-        },
-      ]
-    }
-    onChange={[Function]}
-  >
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Month"
-          id="esUi.cronEditor.cronYearly.fieldMonthLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
+    <div
+      class="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
+        class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
       >
-        <div
-          className="euiFormRow__labelWrapper"
+        <label
+          class="euiFormLabel euiFormControlLayout__prepend"
+          for="generated-id"
         >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
-          >
-            <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Month"
-                id="esUi.cronEditor.cronYearly.fieldMonthLabel"
-                values={Object {}}
-              >
-                Month
-              </FormattedMessage>
-            </label>
-          </EuiFormLabel>
-        </div>
+          On the
+        </label>
         <div
-          className="euiFormRow__fieldWrapper"
+          class="euiFormControlLayout__childrenWrapper"
         >
-          <EuiSelect
-            data-test-subj="cronFrequencyYearlyMonthSelect"
-            fullWidth={true}
+          <select
+            class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+            data-test-subj="cronFrequencyYearlyDateSelect"
             id="generated-id"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            options={
-              Array [
-                Object {
-                  "text": "January",
-                  "value": "1",
-                },
-                Object {
-                  "text": "February",
-                  "value": "2",
-                },
-                Object {
-                  "text": "March",
-                  "value": "3",
-                },
-                Object {
-                  "text": "April",
-                  "value": "4",
-                },
-                Object {
-                  "text": "May",
-                  "value": "5",
-                },
-                Object {
-                  "text": "June",
-                  "value": "6",
-                },
-                Object {
-                  "text": "July",
-                  "value": "7",
-                },
-                Object {
-                  "text": "August",
-                  "value": "8",
-                },
-                Object {
-                  "text": "September",
-                  "value": "9",
-                },
-                Object {
-                  "text": "October",
-                  "value": "10",
-                },
-                Object {
-                  "text": "November",
-                  "value": "11",
-                },
-                Object {
-                  "text": "December",
-                  "value": "12",
-                },
-              ]
-            }
-            prepend="In"
-            value="*"
           >
-            <EuiFormControlLayout
-              compressed={false}
-              fullWidth={true}
-              inputId="generated-id"
-              isDropdown={true}
-              isLoading={false}
-              prepend="In"
+            <option
+              value="1"
             >
-              <div
-                className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-              >
-                <EuiFormLabel
-                  className="euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  <label
-                    className="euiFormLabel euiFormControlLayout__prepend"
-                    htmlFor="generated-id"
-                  >
-                    In
-                  </label>
-                </EuiFormLabel>
-                <div
-                  className="euiFormControlLayout__childrenWrapper"
-                >
-                  <EuiValidatableControl>
-                    <select
-                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                      data-test-subj="cronFrequencyYearlyMonthSelect"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      onMouseUp={[Function]}
-                      value="*"
-                    >
-                      <option
-                        key="0"
-                        value="1"
-                      >
-                        January
-                      </option>
-                      <option
-                        key="1"
-                        value="2"
-                      >
-                        February
-                      </option>
-                      <option
-                        key="2"
-                        value="3"
-                      >
-                        March
-                      </option>
-                      <option
-                        key="3"
-                        value="4"
-                      >
-                        April
-                      </option>
-                      <option
-                        key="4"
-                        value="5"
-                      >
-                        May
-                      </option>
-                      <option
-                        key="5"
-                        value="6"
-                      >
-                        June
-                      </option>
-                      <option
-                        key="6"
-                        value="7"
-                      >
-                        July
-                      </option>
-                      <option
-                        key="7"
-                        value="8"
-                      >
-                        August
-                      </option>
-                      <option
-                        key="8"
-                        value="9"
-                      >
-                        September
-                      </option>
-                      <option
-                        key="9"
-                        value="10"
-                      >
-                        October
-                      </option>
-                      <option
-                        key="10"
-                        value="11"
-                      >
-                        November
-                      </option>
-                      <option
-                        key="11"
-                        value="12"
-                      >
-                        December
-                      </option>
-                    </select>
-                  </EuiValidatableControl>
-                  <EuiFormControlLayoutIcons
-                    compressed={false}
-                    isDropdown={true}
-                    isLoading={false}
-                  >
-                    <div
-                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                    >
-                      <EuiFormControlLayoutCustomIcon
-                        size="m"
-                        type="arrowDown"
-                      >
-                        <span
-                          className="euiFormControlLayoutCustomIcon"
-                        >
-                          <EuiIcon
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            size="m"
-                            type="arrowDown"
-                          >
-                            <span
-                              aria-hidden="true"
-                              className="euiFormControlLayoutCustomIcon__icon"
-                              data-euiicon-type="arrowDown"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                      </EuiFormControlLayoutCustomIcon>
-                    </div>
-                  </EuiFormControlLayoutIcons>
-                </div>
-              </div>
-            </EuiFormControlLayout>
-          </EuiSelect>
+              1st
+            </option>
+            <option
+              value="2"
+            >
+              2nd
+            </option>
+            <option
+              value="3"
+            >
+              3rd
+            </option>
+            <option
+              value="4"
+            >
+              4th
+            </option>
+            <option
+              value="5"
+            >
+              5th
+            </option>
+            <option
+              value="6"
+            >
+              6th
+            </option>
+            <option
+              value="7"
+            >
+              7th
+            </option>
+            <option
+              value="8"
+            >
+              8th
+            </option>
+            <option
+              value="9"
+            >
+              9th
+            </option>
+            <option
+              value="10"
+            >
+              10th
+            </option>
+            <option
+              value="11"
+            >
+              11st
+            </option>
+            <option
+              value="12"
+            >
+              12nd
+            </option>
+            <option
+              value="13"
+            >
+              13rd
+            </option>
+            <option
+              value="14"
+            >
+              14th
+            </option>
+            <option
+              value="15"
+            >
+              15th
+            </option>
+            <option
+              value="16"
+            >
+              16th
+            </option>
+            <option
+              value="17"
+            >
+              17th
+            </option>
+            <option
+              value="18"
+            >
+              18th
+            </option>
+            <option
+              value="19"
+            >
+              19th
+            </option>
+            <option
+              value="20"
+            >
+              20th
+            </option>
+            <option
+              value="21"
+            >
+              21st
+            </option>
+            <option
+              value="22"
+            >
+              22nd
+            </option>
+            <option
+              value="23"
+            >
+              23rd
+            </option>
+            <option
+              value="24"
+            >
+              24th
+            </option>
+            <option
+              value="25"
+            >
+              25th
+            </option>
+            <option
+              value="26"
+            >
+              26th
+            </option>
+            <option
+              value="27"
+            >
+              27th
+            </option>
+            <option
+              value="28"
+            >
+              28th
+            </option>
+            <option
+              value="29"
+            >
+              29th
+            </option>
+            <option
+              value="30"
+            >
+              30th
+            </option>
+            <option
+              value="31"
+            >
+              31st
+            </option>
+          </select>
+          <div
+            class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              class="euiFormControlLayoutCustomIcon"
+            >
+              <span
+                aria-hidden="true"
+                class="euiFormControlLayoutCustomIcon__icon"
+                data-euiicon-type="arrowDown"
+              />
+            </span>
+          </div>
         </div>
       </div>
-    </EuiFormRow>
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Date"
-          id="esUi.cronEditor.cronYearly.fieldDateLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
+    </div>
+  </div>,
+  <div
+    class="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
+    data-test-subj="cronFrequencyConfiguration"
+    id="generated-id-row"
+  >
+    <div
+      class="euiFormRow__labelWrapper"
+    >
+      <label
+        class="euiFormLabel euiFormRow__label"
+        for="generated-id"
+        id="generated-id-label"
+      >
+        Time
+      </label>
+    </div>
+    <div
+      class="euiFormRow__fieldWrapper"
     >
       <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-stretch-row"
+        id="generated-id"
       >
         <div
-          className="euiFormRow__labelWrapper"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
           >
             <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Date"
-                id="esUi.cronEditor.cronYearly.fieldDateLabel"
-                values={Object {}}
-              >
-                Date
-              </FormattedMessage>
+              class="euiFormLabel euiFormControlLayout__prepend"
+            >
+              At
             </label>
-          </EuiFormLabel>
-        </div>
-        <div
-          className="euiFormRow__fieldWrapper"
-        >
-          <EuiSelect
-            data-test-subj="cronFrequencyYearlyDateSelect"
-            fullWidth={true}
-            id="generated-id"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            options={
-              Array [
-                Object {
-                  "text": "1st",
-                  "value": "1",
-                },
-                Object {
-                  "text": "2nd",
-                  "value": "2",
-                },
-                Object {
-                  "text": "3rd",
-                  "value": "3",
-                },
-                Object {
-                  "text": "4th",
-                  "value": "4",
-                },
-                Object {
-                  "text": "5th",
-                  "value": "5",
-                },
-                Object {
-                  "text": "6th",
-                  "value": "6",
-                },
-                Object {
-                  "text": "7th",
-                  "value": "7",
-                },
-                Object {
-                  "text": "8th",
-                  "value": "8",
-                },
-                Object {
-                  "text": "9th",
-                  "value": "9",
-                },
-                Object {
-                  "text": "10th",
-                  "value": "10",
-                },
-                Object {
-                  "text": "11st",
-                  "value": "11",
-                },
-                Object {
-                  "text": "12nd",
-                  "value": "12",
-                },
-                Object {
-                  "text": "13rd",
-                  "value": "13",
-                },
-                Object {
-                  "text": "14th",
-                  "value": "14",
-                },
-                Object {
-                  "text": "15th",
-                  "value": "15",
-                },
-                Object {
-                  "text": "16th",
-                  "value": "16",
-                },
-                Object {
-                  "text": "17th",
-                  "value": "17",
-                },
-                Object {
-                  "text": "18th",
-                  "value": "18",
-                },
-                Object {
-                  "text": "19th",
-                  "value": "19",
-                },
-                Object {
-                  "text": "20th",
-                  "value": "20",
-                },
-                Object {
-                  "text": "21st",
-                  "value": "21",
-                },
-                Object {
-                  "text": "22nd",
-                  "value": "22",
-                },
-                Object {
-                  "text": "23rd",
-                  "value": "23",
-                },
-                Object {
-                  "text": "24th",
-                  "value": "24",
-                },
-                Object {
-                  "text": "25th",
-                  "value": "25",
-                },
-                Object {
-                  "text": "26th",
-                  "value": "26",
-                },
-                Object {
-                  "text": "27th",
-                  "value": "27",
-                },
-                Object {
-                  "text": "28th",
-                  "value": "28",
-                },
-                Object {
-                  "text": "29th",
-                  "value": "29",
-                },
-                Object {
-                  "text": "30th",
-                  "value": "30",
-                },
-                Object {
-                  "text": "31st",
-                  "value": "31",
-                },
-              ]
-            }
-            prepend="On the"
-            value="*"
-          >
-            <EuiFormControlLayout
-              compressed={false}
-              fullWidth={true}
-              inputId="generated-id"
-              isDropdown={true}
-              isLoading={false}
-              prepend="On the"
+            <div
+              class="euiFormControlLayout__childrenWrapper"
             >
+              <select
+                aria-label="Hour"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyYearlyHourSelect"
+              >
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
+                >
+                  08
+                </option>
+                <option
+                  value="9"
+                >
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+              </select>
               <div
-                className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
               >
-                <EuiFormLabel
-                  className="euiFormControlLayout__prepend"
-                  htmlFor="generated-id"
-                >
-                  <label
-                    className="euiFormLabel euiFormControlLayout__prepend"
-                    htmlFor="generated-id"
-                  >
-                    On the
-                  </label>
-                </EuiFormLabel>
-                <div
-                  className="euiFormControlLayout__childrenWrapper"
-                >
-                  <EuiValidatableControl>
-                    <select
-                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                      data-test-subj="cronFrequencyYearlyDateSelect"
-                      id="generated-id"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      onMouseUp={[Function]}
-                      value="*"
-                    >
-                      <option
-                        key="0"
-                        value="1"
-                      >
-                        1st
-                      </option>
-                      <option
-                        key="1"
-                        value="2"
-                      >
-                        2nd
-                      </option>
-                      <option
-                        key="2"
-                        value="3"
-                      >
-                        3rd
-                      </option>
-                      <option
-                        key="3"
-                        value="4"
-                      >
-                        4th
-                      </option>
-                      <option
-                        key="4"
-                        value="5"
-                      >
-                        5th
-                      </option>
-                      <option
-                        key="5"
-                        value="6"
-                      >
-                        6th
-                      </option>
-                      <option
-                        key="6"
-                        value="7"
-                      >
-                        7th
-                      </option>
-                      <option
-                        key="7"
-                        value="8"
-                      >
-                        8th
-                      </option>
-                      <option
-                        key="8"
-                        value="9"
-                      >
-                        9th
-                      </option>
-                      <option
-                        key="9"
-                        value="10"
-                      >
-                        10th
-                      </option>
-                      <option
-                        key="10"
-                        value="11"
-                      >
-                        11st
-                      </option>
-                      <option
-                        key="11"
-                        value="12"
-                      >
-                        12nd
-                      </option>
-                      <option
-                        key="12"
-                        value="13"
-                      >
-                        13rd
-                      </option>
-                      <option
-                        key="13"
-                        value="14"
-                      >
-                        14th
-                      </option>
-                      <option
-                        key="14"
-                        value="15"
-                      >
-                        15th
-                      </option>
-                      <option
-                        key="15"
-                        value="16"
-                      >
-                        16th
-                      </option>
-                      <option
-                        key="16"
-                        value="17"
-                      >
-                        17th
-                      </option>
-                      <option
-                        key="17"
-                        value="18"
-                      >
-                        18th
-                      </option>
-                      <option
-                        key="18"
-                        value="19"
-                      >
-                        19th
-                      </option>
-                      <option
-                        key="19"
-                        value="20"
-                      >
-                        20th
-                      </option>
-                      <option
-                        key="20"
-                        value="21"
-                      >
-                        21st
-                      </option>
-                      <option
-                        key="21"
-                        value="22"
-                      >
-                        22nd
-                      </option>
-                      <option
-                        key="22"
-                        value="23"
-                      >
-                        23rd
-                      </option>
-                      <option
-                        key="23"
-                        value="24"
-                      >
-                        24th
-                      </option>
-                      <option
-                        key="24"
-                        value="25"
-                      >
-                        25th
-                      </option>
-                      <option
-                        key="25"
-                        value="26"
-                      >
-                        26th
-                      </option>
-                      <option
-                        key="26"
-                        value="27"
-                      >
-                        27th
-                      </option>
-                      <option
-                        key="27"
-                        value="28"
-                      >
-                        28th
-                      </option>
-                      <option
-                        key="28"
-                        value="29"
-                      >
-                        29th
-                      </option>
-                      <option
-                        key="29"
-                        value="30"
-                      >
-                        30th
-                      </option>
-                      <option
-                        key="30"
-                        value="31"
-                      >
-                        31st
-                      </option>
-                    </select>
-                  </EuiValidatableControl>
-                  <EuiFormControlLayoutIcons
-                    compressed={false}
-                    isDropdown={true}
-                    isLoading={false}
-                  >
-                    <div
-                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                    >
-                      <EuiFormControlLayoutCustomIcon
-                        size="m"
-                        type="arrowDown"
-                      >
-                        <span
-                          className="euiFormControlLayoutCustomIcon"
-                        >
-                          <EuiIcon
-                            aria-hidden="true"
-                            className="euiFormControlLayoutCustomIcon__icon"
-                            size="m"
-                            type="arrowDown"
-                          >
-                            <span
-                              aria-hidden="true"
-                              className="euiFormControlLayoutCustomIcon__icon"
-                              data-euiicon-type="arrowDown"
-                              size="m"
-                            />
-                          </EuiIcon>
-                        </span>
-                      </EuiFormControlLayoutCustomIcon>
-                    </div>
-                  </EuiFormControlLayoutIcons>
-                </div>
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
               </div>
-            </EuiFormControlLayout>
-          </EuiSelect>
+            </div>
+          </div>
         </div>
-      </div>
-    </EuiFormRow>
-    <EuiFormRow
-      data-test-subj="cronFrequencyConfiguration"
-      describedByIds={Array []}
-      display="row"
-      fullWidth={true}
-      hasChildLabel={true}
-      hasEmptyLabelSpace={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Time"
-          id="esUi.cronEditor.cronYearly.fieldTimeLabel"
-          values={Object {}}
-        />
-      }
-      labelType="label"
-    >
-      <div
-        className="euiFormRow euiFormRow--fullWidth euiFormRow--hasLabel"
-        data-test-subj="cronFrequencyConfiguration"
-        id="generated-id-row"
-      >
         <div
-          className="euiFormRow__labelWrapper"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
-          <EuiFormLabel
-            className="euiFormRow__label"
-            htmlFor="generated-id"
-            id="generated-id-label"
-            isFocused={false}
-            type="label"
+          <div
+            class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
           >
             <label
-              className="euiFormLabel euiFormRow__label"
-              htmlFor="generated-id"
-              id="generated-id-label"
-            >
-              <FormattedMessage
-                defaultMessage="Time"
-                id="esUi.cronEditor.cronYearly.fieldTimeLabel"
-                values={Object {}}
-              >
-                Time
-              </FormattedMessage>
+              class="euiFormLabel euiFormControlLayout__prepend"
+            >
+              :
             </label>
-          </EuiFormLabel>
-        </div>
-        <div
-          className="euiFormRow__fieldWrapper"
-        >
-          <EuiFlexGroup
-            gutterSize="xs"
-            id="generated-id"
-            onBlur={[Function]}
-            onFocus={[Function]}
-          >
             <div
-              className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
-              id="generated-id"
-              onBlur={[Function]}
-              onFocus={[Function]}
+              class="euiFormControlLayout__childrenWrapper"
             >
-              <EuiFlexItem
-                grow={false}
+              <select
+                aria-label="Minute"
+                class="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
+                data-test-subj="cronFrequencyYearlyMinuteSelect"
+              >
+                <option
+                  value="0"
+                >
+                  00
+                </option>
+                <option
+                  value="1"
+                >
+                  01
+                </option>
+                <option
+                  value="2"
+                >
+                  02
+                </option>
+                <option
+                  value="3"
+                >
+                  03
+                </option>
+                <option
+                  value="4"
+                >
+                  04
+                </option>
+                <option
+                  value="5"
+                >
+                  05
+                </option>
+                <option
+                  value="6"
+                >
+                  06
+                </option>
+                <option
+                  value="7"
+                >
+                  07
+                </option>
+                <option
+                  value="8"
+                >
+                  08
+                </option>
+                <option
+                  value="9"
+                >
+                  09
+                </option>
+                <option
+                  value="10"
+                >
+                  10
+                </option>
+                <option
+                  value="11"
+                >
+                  11
+                </option>
+                <option
+                  value="12"
+                >
+                  12
+                </option>
+                <option
+                  value="13"
+                >
+                  13
+                </option>
+                <option
+                  value="14"
+                >
+                  14
+                </option>
+                <option
+                  value="15"
+                >
+                  15
+                </option>
+                <option
+                  value="16"
+                >
+                  16
+                </option>
+                <option
+                  value="17"
+                >
+                  17
+                </option>
+                <option
+                  value="18"
+                >
+                  18
+                </option>
+                <option
+                  value="19"
+                >
+                  19
+                </option>
+                <option
+                  value="20"
+                >
+                  20
+                </option>
+                <option
+                  value="21"
+                >
+                  21
+                </option>
+                <option
+                  value="22"
+                >
+                  22
+                </option>
+                <option
+                  value="23"
+                >
+                  23
+                </option>
+                <option
+                  value="24"
+                >
+                  24
+                </option>
+                <option
+                  value="25"
+                >
+                  25
+                </option>
+                <option
+                  value="26"
+                >
+                  26
+                </option>
+                <option
+                  value="27"
+                >
+                  27
+                </option>
+                <option
+                  value="28"
+                >
+                  28
+                </option>
+                <option
+                  value="29"
+                >
+                  29
+                </option>
+                <option
+                  value="30"
+                >
+                  30
+                </option>
+                <option
+                  value="31"
+                >
+                  31
+                </option>
+                <option
+                  value="32"
+                >
+                  32
+                </option>
+                <option
+                  value="33"
+                >
+                  33
+                </option>
+                <option
+                  value="34"
+                >
+                  34
+                </option>
+                <option
+                  value="35"
+                >
+                  35
+                </option>
+                <option
+                  value="36"
+                >
+                  36
+                </option>
+                <option
+                  value="37"
+                >
+                  37
+                </option>
+                <option
+                  value="38"
+                >
+                  38
+                </option>
+                <option
+                  value="39"
+                >
+                  39
+                </option>
+                <option
+                  value="40"
+                >
+                  40
+                </option>
+                <option
+                  value="41"
+                >
+                  41
+                </option>
+                <option
+                  value="42"
+                >
+                  42
+                </option>
+                <option
+                  value="43"
+                >
+                  43
+                </option>
+                <option
+                  value="44"
+                >
+                  44
+                </option>
+                <option
+                  value="45"
+                >
+                  45
+                </option>
+                <option
+                  value="46"
+                >
+                  46
+                </option>
+                <option
+                  value="47"
+                >
+                  47
+                </option>
+                <option
+                  value="48"
+                >
+                  48
+                </option>
+                <option
+                  value="49"
+                >
+                  49
+                </option>
+                <option
+                  value="50"
+                >
+                  50
+                </option>
+                <option
+                  value="51"
+                >
+                  51
+                </option>
+                <option
+                  value="52"
+                >
+                  52
+                </option>
+                <option
+                  value="53"
+                >
+                  53
+                </option>
+                <option
+                  value="54"
+                >
+                  54
+                </option>
+                <option
+                  value="55"
+                >
+                  55
+                </option>
+                <option
+                  value="56"
+                >
+                  56
+                </option>
+                <option
+                  value="57"
+                >
+                  57
+                </option>
+                <option
+                  value="58"
+                >
+                  58
+                </option>
+                <option
+                  value="59"
+                >
+                  59
+                </option>
+              </select>
+              <div
+                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
               >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiSelect
-                    aria-label="Hour"
-                    data-test-subj="cronFrequencyYearlyHourSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                      ]
-                    }
-                    prepend="At"
-                    value="*"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend="At"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            At
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Hour"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyYearlyHourSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="*"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <div
-                  className="euiFlexItem"
-                >
-                  <EuiSelect
-                    aria-label="Minute"
-                    data-test-subj="cronFrequencyYearlyMinuteSelect"
-                    fullWidth={true}
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "00",
-                          "value": "0",
-                        },
-                        Object {
-                          "text": "01",
-                          "value": "1",
-                        },
-                        Object {
-                          "text": "02",
-                          "value": "2",
-                        },
-                        Object {
-                          "text": "03",
-                          "value": "3",
-                        },
-                        Object {
-                          "text": "04",
-                          "value": "4",
-                        },
-                        Object {
-                          "text": "05",
-                          "value": "5",
-                        },
-                        Object {
-                          "text": "06",
-                          "value": "6",
-                        },
-                        Object {
-                          "text": "07",
-                          "value": "7",
-                        },
-                        Object {
-                          "text": "08",
-                          "value": "8",
-                        },
-                        Object {
-                          "text": "09",
-                          "value": "9",
-                        },
-                        Object {
-                          "text": "10",
-                          "value": "10",
-                        },
-                        Object {
-                          "text": "11",
-                          "value": "11",
-                        },
-                        Object {
-                          "text": "12",
-                          "value": "12",
-                        },
-                        Object {
-                          "text": "13",
-                          "value": "13",
-                        },
-                        Object {
-                          "text": "14",
-                          "value": "14",
-                        },
-                        Object {
-                          "text": "15",
-                          "value": "15",
-                        },
-                        Object {
-                          "text": "16",
-                          "value": "16",
-                        },
-                        Object {
-                          "text": "17",
-                          "value": "17",
-                        },
-                        Object {
-                          "text": "18",
-                          "value": "18",
-                        },
-                        Object {
-                          "text": "19",
-                          "value": "19",
-                        },
-                        Object {
-                          "text": "20",
-                          "value": "20",
-                        },
-                        Object {
-                          "text": "21",
-                          "value": "21",
-                        },
-                        Object {
-                          "text": "22",
-                          "value": "22",
-                        },
-                        Object {
-                          "text": "23",
-                          "value": "23",
-                        },
-                        Object {
-                          "text": "24",
-                          "value": "24",
-                        },
-                        Object {
-                          "text": "25",
-                          "value": "25",
-                        },
-                        Object {
-                          "text": "26",
-                          "value": "26",
-                        },
-                        Object {
-                          "text": "27",
-                          "value": "27",
-                        },
-                        Object {
-                          "text": "28",
-                          "value": "28",
-                        },
-                        Object {
-                          "text": "29",
-                          "value": "29",
-                        },
-                        Object {
-                          "text": "30",
-                          "value": "30",
-                        },
-                        Object {
-                          "text": "31",
-                          "value": "31",
-                        },
-                        Object {
-                          "text": "32",
-                          "value": "32",
-                        },
-                        Object {
-                          "text": "33",
-                          "value": "33",
-                        },
-                        Object {
-                          "text": "34",
-                          "value": "34",
-                        },
-                        Object {
-                          "text": "35",
-                          "value": "35",
-                        },
-                        Object {
-                          "text": "36",
-                          "value": "36",
-                        },
-                        Object {
-                          "text": "37",
-                          "value": "37",
-                        },
-                        Object {
-                          "text": "38",
-                          "value": "38",
-                        },
-                        Object {
-                          "text": "39",
-                          "value": "39",
-                        },
-                        Object {
-                          "text": "40",
-                          "value": "40",
-                        },
-                        Object {
-                          "text": "41",
-                          "value": "41",
-                        },
-                        Object {
-                          "text": "42",
-                          "value": "42",
-                        },
-                        Object {
-                          "text": "43",
-                          "value": "43",
-                        },
-                        Object {
-                          "text": "44",
-                          "value": "44",
-                        },
-                        Object {
-                          "text": "45",
-                          "value": "45",
-                        },
-                        Object {
-                          "text": "46",
-                          "value": "46",
-                        },
-                        Object {
-                          "text": "47",
-                          "value": "47",
-                        },
-                        Object {
-                          "text": "48",
-                          "value": "48",
-                        },
-                        Object {
-                          "text": "49",
-                          "value": "49",
-                        },
-                        Object {
-                          "text": "50",
-                          "value": "50",
-                        },
-                        Object {
-                          "text": "51",
-                          "value": "51",
-                        },
-                        Object {
-                          "text": "52",
-                          "value": "52",
-                        },
-                        Object {
-                          "text": "53",
-                          "value": "53",
-                        },
-                        Object {
-                          "text": "54",
-                          "value": "54",
-                        },
-                        Object {
-                          "text": "55",
-                          "value": "55",
-                        },
-                        Object {
-                          "text": "56",
-                          "value": "56",
-                        },
-                        Object {
-                          "text": "57",
-                          "value": "57",
-                        },
-                        Object {
-                          "text": "58",
-                          "value": "58",
-                        },
-                        Object {
-                          "text": "59",
-                          "value": "59",
-                        },
-                      ]
-                    }
-                    prepend=":"
-                    value="10"
-                  >
-                    <EuiFormControlLayout
-                      compressed={false}
-                      fullWidth={true}
-                      isDropdown={true}
-                      isLoading={false}
-                      prepend=":"
-                    >
-                      <div
-                        className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                      >
-                        <EuiFormLabel
-                          className="euiFormControlLayout__prepend"
-                        >
-                          <label
-                            className="euiFormLabel euiFormControlLayout__prepend"
-                          >
-                            :
-                          </label>
-                        </EuiFormLabel>
-                        <div
-                          className="euiFormControlLayout__childrenWrapper"
-                        >
-                          <EuiValidatableControl>
-                            <select
-                              aria-label="Minute"
-                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
-                              data-test-subj="cronFrequencyYearlyMinuteSelect"
-                              onChange={[Function]}
-                              onMouseUp={[Function]}
-                              value="10"
-                            >
-                              <option
-                                key="0"
-                                value="0"
-                              >
-                                00
-                              </option>
-                              <option
-                                key="1"
-                                value="1"
-                              >
-                                01
-                              </option>
-                              <option
-                                key="2"
-                                value="2"
-                              >
-                                02
-                              </option>
-                              <option
-                                key="3"
-                                value="3"
-                              >
-                                03
-                              </option>
-                              <option
-                                key="4"
-                                value="4"
-                              >
-                                04
-                              </option>
-                              <option
-                                key="5"
-                                value="5"
-                              >
-                                05
-                              </option>
-                              <option
-                                key="6"
-                                value="6"
-                              >
-                                06
-                              </option>
-                              <option
-                                key="7"
-                                value="7"
-                              >
-                                07
-                              </option>
-                              <option
-                                key="8"
-                                value="8"
-                              >
-                                08
-                              </option>
-                              <option
-                                key="9"
-                                value="9"
-                              >
-                                09
-                              </option>
-                              <option
-                                key="10"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                key="11"
-                                value="11"
-                              >
-                                11
-                              </option>
-                              <option
-                                key="12"
-                                value="12"
-                              >
-                                12
-                              </option>
-                              <option
-                                key="13"
-                                value="13"
-                              >
-                                13
-                              </option>
-                              <option
-                                key="14"
-                                value="14"
-                              >
-                                14
-                              </option>
-                              <option
-                                key="15"
-                                value="15"
-                              >
-                                15
-                              </option>
-                              <option
-                                key="16"
-                                value="16"
-                              >
-                                16
-                              </option>
-                              <option
-                                key="17"
-                                value="17"
-                              >
-                                17
-                              </option>
-                              <option
-                                key="18"
-                                value="18"
-                              >
-                                18
-                              </option>
-                              <option
-                                key="19"
-                                value="19"
-                              >
-                                19
-                              </option>
-                              <option
-                                key="20"
-                                value="20"
-                              >
-                                20
-                              </option>
-                              <option
-                                key="21"
-                                value="21"
-                              >
-                                21
-                              </option>
-                              <option
-                                key="22"
-                                value="22"
-                              >
-                                22
-                              </option>
-                              <option
-                                key="23"
-                                value="23"
-                              >
-                                23
-                              </option>
-                              <option
-                                key="24"
-                                value="24"
-                              >
-                                24
-                              </option>
-                              <option
-                                key="25"
-                                value="25"
-                              >
-                                25
-                              </option>
-                              <option
-                                key="26"
-                                value="26"
-                              >
-                                26
-                              </option>
-                              <option
-                                key="27"
-                                value="27"
-                              >
-                                27
-                              </option>
-                              <option
-                                key="28"
-                                value="28"
-                              >
-                                28
-                              </option>
-                              <option
-                                key="29"
-                                value="29"
-                              >
-                                29
-                              </option>
-                              <option
-                                key="30"
-                                value="30"
-                              >
-                                30
-                              </option>
-                              <option
-                                key="31"
-                                value="31"
-                              >
-                                31
-                              </option>
-                              <option
-                                key="32"
-                                value="32"
-                              >
-                                32
-                              </option>
-                              <option
-                                key="33"
-                                value="33"
-                              >
-                                33
-                              </option>
-                              <option
-                                key="34"
-                                value="34"
-                              >
-                                34
-                              </option>
-                              <option
-                                key="35"
-                                value="35"
-                              >
-                                35
-                              </option>
-                              <option
-                                key="36"
-                                value="36"
-                              >
-                                36
-                              </option>
-                              <option
-                                key="37"
-                                value="37"
-                              >
-                                37
-                              </option>
-                              <option
-                                key="38"
-                                value="38"
-                              >
-                                38
-                              </option>
-                              <option
-                                key="39"
-                                value="39"
-                              >
-                                39
-                              </option>
-                              <option
-                                key="40"
-                                value="40"
-                              >
-                                40
-                              </option>
-                              <option
-                                key="41"
-                                value="41"
-                              >
-                                41
-                              </option>
-                              <option
-                                key="42"
-                                value="42"
-                              >
-                                42
-                              </option>
-                              <option
-                                key="43"
-                                value="43"
-                              >
-                                43
-                              </option>
-                              <option
-                                key="44"
-                                value="44"
-                              >
-                                44
-                              </option>
-                              <option
-                                key="45"
-                                value="45"
-                              >
-                                45
-                              </option>
-                              <option
-                                key="46"
-                                value="46"
-                              >
-                                46
-                              </option>
-                              <option
-                                key="47"
-                                value="47"
-                              >
-                                47
-                              </option>
-                              <option
-                                key="48"
-                                value="48"
-                              >
-                                48
-                              </option>
-                              <option
-                                key="49"
-                                value="49"
-                              >
-                                49
-                              </option>
-                              <option
-                                key="50"
-                                value="50"
-                              >
-                                50
-                              </option>
-                              <option
-                                key="51"
-                                value="51"
-                              >
-                                51
-                              </option>
-                              <option
-                                key="52"
-                                value="52"
-                              >
-                                52
-                              </option>
-                              <option
-                                key="53"
-                                value="53"
-                              >
-                                53
-                              </option>
-                              <option
-                                key="54"
-                                value="54"
-                              >
-                                54
-                              </option>
-                              <option
-                                key="55"
-                                value="55"
-                              >
-                                55
-                              </option>
-                              <option
-                                key="56"
-                                value="56"
-                              >
-                                56
-                              </option>
-                              <option
-                                key="57"
-                                value="57"
-                              >
-                                57
-                              </option>
-                              <option
-                                key="58"
-                                value="58"
-                              >
-                                58
-                              </option>
-                              <option
-                                key="59"
-                                value="59"
-                              >
-                                59
-                              </option>
-                            </select>
-                          </EuiValidatableControl>
-                          <EuiFormControlLayoutIcons
-                            compressed={false}
-                            isDropdown={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <EuiFormControlLayoutCustomIcon
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <span
-                                  className="euiFormControlLayoutCustomIcon"
-                                >
-                                  <EuiIcon
-                                    aria-hidden="true"
-                                    className="euiFormControlLayoutCustomIcon__icon"
-                                    size="m"
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      aria-hidden="true"
-                                      className="euiFormControlLayoutCustomIcon__icon"
-                                      data-euiicon-type="arrowDown"
-                                      size="m"
-                                    />
-                                  </EuiIcon>
-                                </span>
-                              </EuiFormControlLayoutCustomIcon>
-                            </div>
-                          </EuiFormControlLayoutIcons>
-                        </div>
-                      </div>
-                    </EuiFormControlLayout>
-                  </EuiSelect>
-                </div>
-              </EuiFlexItem>
+                <span
+                  class="euiFormControlLayoutCustomIcon"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="euiFormControlLayoutCustomIcon__icon"
+                    data-euiicon-type="arrowDown"
+                  />
+                </span>
+              </div>
             </div>
-          </EuiFlexGroup>
+          </div>
         </div>
       </div>
-    </EuiFormRow>
-  </CronYearly>
-</CronEditor>
+    </div>
+  </div>,
+]
 `;
diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
index cb8994b153bdd..1f2f9c57a689b 100644
--- a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
+++ b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
@@ -26,7 +26,7 @@ describe('CronEditor', () => {
         />
       );
 
-      expect(component).toMatchSnapshot();
+      expect(component.render()).toMatchSnapshot();
     });
   });
 
diff --git a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/__snapshots__/view_api_request_flyout.test.tsx.snap b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/__snapshots__/view_api_request_flyout.test.tsx.snap
index f1b25d6da1145..91f2150904c4a 100644
--- a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/__snapshots__/view_api_request_flyout.test.tsx.snap
+++ b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/__snapshots__/view_api_request_flyout.test.tsx.snap
@@ -25,7 +25,7 @@ exports[`ViewApiRequestFlyout is rendered 1`] = `
     class="euiFlyoutBody emotion-euiFlyoutBody"
   >
     <div
-      class="euiFlyoutBody__overflow css-1fk8opf-noBanner"
+      class="euiFlyoutBody__overflow css-18yrfj9-noBanner"
       tabindex="0"
     >
       <div
diff --git a/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap b/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
index 6fc57bc9af1cc..5024310be1071 100644
--- a/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
+++ b/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
@@ -8,10 +8,10 @@ Array [
     Load Kibana objects
   </h2>,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-center-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
         class="euiText emotion-euiText-m"
@@ -22,10 +22,10 @@ Array [
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
         data-test-subj="loadSavedObjects"
         type="button"
       >
@@ -65,10 +65,10 @@ Array [
     Load Kibana objects
   </h2>,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-center-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
         class="euiText emotion-euiText-m"
@@ -79,10 +79,10 @@ Array [
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
         data-test-subj="loadSavedObjects"
         type="button"
       >
diff --git a/src/plugins/home/public/application/components/tutorial/__snapshots__/tutorial.test.js.snap b/src/plugins/home/public/application/components/tutorial/__snapshots__/tutorial.test.js.snap
index 9dfa395d04b71..bd4e658b04a99 100644
--- a/src/plugins/home/public/application/components/tutorial/__snapshots__/tutorial.test.js.snap
+++ b/src/plugins/home/public/application/components/tutorial/__snapshots__/tutorial.test.js.snap
@@ -62,7 +62,6 @@ exports[`isCloudEnabled is false should render ON_PREM instructions with instruc
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       labelType="label"
diff --git a/src/plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
index 0c809d96b3183..64fec12d4df4a 100644
--- a/src/plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
+++ b/src/plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
@@ -131,7 +131,6 @@ exports[`renders ControlsTab 1`] = `
         <EuiFormRow
           describedByIds={Array []}
           display="row"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           id="selectControlType"
@@ -163,7 +162,6 @@ exports[`renders ControlsTab 1`] = `
         <EuiFormRow
           describedByIds={Array []}
           display="row"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           id="addControl"
diff --git a/src/plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
index 776e569c88873..8e70b2196d757 100644
--- a/src/plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
+++ b/src/plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
@@ -19,7 +19,6 @@ exports[`renders dynamic options should display disabled dynamic options with to
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -49,7 +48,6 @@ exports[`renders dynamic options should display disabled dynamic options with to
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -80,7 +78,6 @@ exports[`renders dynamic options should display disabled dynamic options with to
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -130,7 +127,6 @@ exports[`renders dynamic options should display dynamic options for string field
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -160,7 +156,6 @@ exports[`renders dynamic options should display dynamic options for string field
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -210,7 +205,6 @@ exports[`renders dynamic options should display size field when dynamic options
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -240,7 +234,6 @@ exports[`renders dynamic options should display size field when dynamic options
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -271,7 +264,6 @@ exports[`renders dynamic options should display size field when dynamic options
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -321,7 +313,6 @@ exports[`renders should display chaining input when parents are provided 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -366,7 +357,6 @@ exports[`renders should display chaining input when parents are provided 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -396,7 +386,6 @@ exports[`renders should display chaining input when parents are provided 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -427,7 +416,6 @@ exports[`renders should display chaining input when parents are provided 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
diff --git a/src/plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
index 3356538870f80..ef534f123acb2 100644
--- a/src/plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
+++ b/src/plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`OptionsTab should renders OptionsTab 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     id="updateFiltersOnChange"
@@ -27,7 +26,6 @@ exports[`OptionsTab should renders OptionsTab 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     id="useTimeFilter"
@@ -49,7 +47,6 @@ exports[`OptionsTab should renders OptionsTab 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     id="pinFilters"
diff --git a/src/plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
index 67480e68a6bc3..aee140079dd73 100644
--- a/src/plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
+++ b/src/plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
@@ -19,7 +19,6 @@ exports[`renders RangeControlEditor 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     id="stepSize-0"
@@ -41,7 +40,6 @@ exports[`renders RangeControlEditor 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     id="decimalPlaces-0"
diff --git a/src/plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap b/src/plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
index 8a4f9b930f4a7..8a1bbc60c4511 100644
--- a/src/plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
+++ b/src/plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`renders control with warning 1`] = `
   data-test-subj="inputControl0"
   describedByIds={Array []}
   display="row"
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   id="controlId"
@@ -37,7 +36,6 @@ exports[`renders disabled control with tooltip 1`] = `
   data-test-subj="inputControl0"
   describedByIds={Array []}
   display="row"
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   id="controlId"
@@ -63,7 +61,6 @@ exports[`renders enabled control 1`] = `
   data-test-subj="inputControl0"
   describedByIds={Array []}
   display="row"
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   id="controlId"
diff --git a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
index 9afef39aab9c2..6bfa8ef8cc9e7 100644
--- a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
+++ b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
@@ -6,10 +6,10 @@ Array [
     class="euiFlyoutHeader emotion-euiFlyoutHeader-hasBorder"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-center-row"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <h1
           class="euiTitle emotion-euiTitle-s"
@@ -18,7 +18,7 @@ Array [
         </h1>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -56,7 +56,7 @@ Array [
     class="euiFlyoutBody insInspectorPanel__flyoutBody emotion-euiFlyoutBody"
   >
     <div
-      class="euiFlyoutBody__overflow css-1fk8opf-noBanner"
+      class="euiFlyoutBody__overflow css-18yrfj9-noBanner"
       tabindex="0"
     >
       <div
diff --git a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
index 6b192533c173c..3ac183860d215 100644
--- a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
+++ b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
@@ -1130,10 +1130,10 @@ exports[`Overview renders correctly without solutions 1`] = `
 
 exports[`Overview show loading spinner during loading 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-l-center-center-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <span
       aria-label="Loading"
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap b/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
index b1c8e1097cbd6..b25b6fdade799 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
@@ -15,17 +15,17 @@ exports[`<ExitFullScreenButton /> is rendered 1`] = `
       data-test-subj="exitFullScreenModeLogo"
     >
       <span
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+        class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <span
             data-euiicon-type="logoElastic"
           />
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
           data-test-subj="exitFullScreenModeText"
         >
           <div>
@@ -39,7 +39,7 @@ exports[`<ExitFullScreenButton /> is rendered 1`] = `
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <span
             class="dshExitFullScreenButton__icon"
diff --git a/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap b/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
index 6ac8485467675..eb340494403b7 100644
--- a/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
+++ b/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
@@ -17,10 +17,10 @@ exports[`KibanaPageTemplate render basic template 1`] = `
         style="max-width:1200px"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+          class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem"
+            class="euiFlexItem emotion-euiFlexItem-grow-1"
           >
             <div
               class="euiText emotion-euiText-constrainedWidth-m"
@@ -31,13 +31,13 @@ exports[`KibanaPageTemplate render basic template 1`] = `
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+              class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 test
               </div>
@@ -397,10 +397,10 @@ exports[`KibanaPageTemplate render solutionNav 1`] = `
           style="max-width:1200px"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+            class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
           >
             <div
-              class="euiFlexItem"
+              class="euiFlexItem emotion-euiFlexItem-grow-1"
             >
               <div
                 class="euiText emotion-euiText-constrainedWidth-m"
@@ -411,13 +411,13 @@ exports[`KibanaPageTemplate render solutionNav 1`] = `
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+                class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   test
                 </div>
diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
index 640bde4de40f9..b9cd02ecc6f7f 100644
--- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
+++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
@@ -2,165 +2,181 @@
 
 exports[`NoDataCard props button 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-euiCard-center-vertical"
+  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-euiCard-center"
 >
   <div
-    class="euiCard__content emotion-euiCard__content-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-center"
-      >
-        Card title
-      </span>
-    </p>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        Description
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-center"
+        >
+          Card title
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          Description
+        </p>
+      </div>
     </div>
-  </div>
-  <div
-    class="emotion-euiCard__footer"
-  >
-    <button
-      class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
-      type="button"
+    <div
+      class="emotion-euiCard__footer"
     >
-      <span
-        class="emotion-euiButtonDisplayContent"
+      <button
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
+        type="button"
       >
         <span
-          class="eui-textTruncate"
+          class="emotion-euiButtonDisplayContent"
         >
-          Button
+          <span
+            class="eui-textTruncate"
+          >
+            Button
+          </span>
         </span>
-      </span>
-    </button>
+      </button>
+    </div>
   </div>
 </div>
 `;
 
 exports[`NoDataCard props href 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-isClickable-euiCard-center-vertical"
+  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-isClickable-euiCard-center"
 >
   <div
-    class="euiCard__content emotion-euiCard__content-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <a
-        aria-describedby="generated-idDescription"
-        class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
-        href="#"
-        rel="noreferrer"
-      >
-        Card title
-      </a>
-    </p>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        Description
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <a
+          aria-describedby="generated-idDescription"
+          class="euiCard__titleAnchor emotion-euiCard__text-center-interactive"
+          href="#"
+          rel="noreferrer"
+        >
+          Card title
+        </a>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          Description
+        </p>
+      </div>
     </div>
-  </div>
-  <div
-    class="emotion-euiCard__footer"
-  >
-    <button
-      class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
-      type="button"
+    <div
+      class="emotion-euiCard__footer"
     >
-      <span
-        class="emotion-euiButtonDisplayContent"
+      <button
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
+        type="button"
       >
         <span
-          class="eui-textTruncate"
+          class="emotion-euiButtonDisplayContent"
         >
-          Button
+          <span
+            class="eui-textTruncate"
+          >
+            Button
+          </span>
         </span>
-      </span>
-    </button>
+      </button>
+    </div>
   </div>
 </div>
 `;
 
 exports[`NoDataCard props recommended 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-euiCard-center-vertical-hasBetaBadge"
+  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-euiCard-center-hasBetaBadge"
 >
   <div
-    class="euiCard__content emotion-euiCard__content-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-center"
-      >
-        Card title
-      </span>
-    </p>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        Description
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-center"
+        >
+          Card title
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          Description
+        </p>
+      </div>
     </div>
-  </div>
-  <span
-    class="emotion-euiCard__betaBadgeAnchor"
-  >
     <span
-      class="euiBetaBadge euiBetaBadge--hollow emotion-euiCard__betaBadge"
-      id="generated-idBetaBadge"
-      title="Recommended"
+      class="emotion-euiCard__betaBadgeAnchor"
     >
-      Recommended
+      <span
+        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
+        id="generated-idBetaBadge"
+        title="Recommended"
+      >
+        Recommended
+      </span>
     </span>
-  </span>
+  </div>
 </div>
 `;
 
 exports[`NoDataCard renders 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-euiCard-center-vertical"
+  class="euiPanel euiPanel--plain euiPanel--paddingLarge euiCard emotion-euiPanel-grow-m-l-plain-hasShadow-euiCard-center"
 >
   <div
-    class="euiCard__content emotion-euiCard__content-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-center"
-      >
-        Card title
-      </span>
-    </p>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        Description
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-center"
+        >
+          Card title
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          Description
+        </p>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
index d65f00bae63e6..61055ed0fe22d 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
@@ -8,10 +8,10 @@ exports[`Intro component renders correctly 1`] = `
     class="euiPageHeaderContent emotion-euiPageHeaderContent-border-l"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+      class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <h1
           class="euiTitle emotion-euiTitle-l"
@@ -20,16 +20,16 @@ exports[`Intro component renders correctly 1`] = `
         </h1>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRowReverse euiFlexGroup--wrap"
+          class="euiFlexGroup emotion-euiFlexGroup-wrap-l-flexStart-stretch-rowReverse"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <a
-              class="euiButton emotion-euiButtonDisplay-s-s-base-primary"
+              class="euiButton emotion-euiButtonDisplay-s-defaultMinWidth-s-base-primary"
               data-test-subj="savedObjectEditViewInApp"
               href="/some-url"
               rel="noreferrer"
@@ -46,10 +46,10 @@ exports[`Intro component renders correctly 1`] = `
             </a>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <button
-              class="euiButton emotion-euiButtonDisplay-s-s-base-danger"
+              class="euiButton emotion-euiButtonDisplay-s-defaultMinWidth-s-base-danger"
               data-test-subj="savedObjectEditDelete"
               type="button"
             >
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
index 2d44afa16514a..3a030487b1204 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
@@ -69,7 +69,6 @@ exports[`Table prevents saved objects from being deleted 1`] = `
           <EuiFormRow
             describedByIds={Array []}
             display="row"
-            fullWidth={false}
             hasChildLabel={true}
             hasEmptyLabelSpace={false}
             label={
@@ -97,7 +96,6 @@ exports[`Table prevents saved objects from being deleted 1`] = `
           <EuiFormRow
             describedByIds={Array []}
             display="row"
-            fullWidth={false}
             hasChildLabel={true}
             hasEmptyLabelSpace={false}
             labelType="label"
@@ -309,7 +307,6 @@ exports[`Table should render normally 1`] = `
           <EuiFormRow
             describedByIds={Array []}
             display="row"
-            fullWidth={false}
             hasChildLabel={true}
             hasEmptyLabelSpace={false}
             label={
@@ -337,7 +334,6 @@ exports[`Table should render normally 1`] = `
           <EuiFormRow
             describedByIds={Array []}
             display="row"
-            fullWidth={false}
             hasChildLabel={true}
             hasEmptyLabelSpace={false}
             labelType="label"
diff --git a/src/plugins/share/public/components/__snapshots__/url_panel_content.test.tsx.snap b/src/plugins/share/public/components/__snapshots__/url_panel_content.test.tsx.snap
index b0fed8a7bd3b5..c5ab893e57139 100644
--- a/src/plugins/share/public/components/__snapshots__/url_panel_content.test.tsx.snap
+++ b/src/plugins/share/public/components/__snapshots__/url_panel_content.test.tsx.snap
@@ -9,7 +9,6 @@ exports[`share url panel content render 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       helpText={
@@ -121,7 +120,6 @@ exports[`share url panel content render 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -140,7 +138,6 @@ exports[`share url panel content render 1`] = `
         data-test-subj="createShortUrl"
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         labelType="label"
@@ -205,7 +202,6 @@ exports[`share url panel content should enable saved object export option when o
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       labelType="label"
@@ -306,7 +302,6 @@ exports[`share url panel content should enable saved object export option when o
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -325,7 +320,6 @@ exports[`share url panel content should enable saved object export option when o
         data-test-subj="createShortUrl"
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         labelType="label"
@@ -390,7 +384,6 @@ exports[`share url panel content should hide short url section when allowShortUr
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       labelType="label"
@@ -511,7 +504,6 @@ exports[`should show url param extensions 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       labelType="label"
@@ -612,7 +604,6 @@ exports[`should show url param extensions 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       key="testExtension"
@@ -625,7 +616,6 @@ exports[`should show url param extensions 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -644,7 +634,6 @@ exports[`should show url param extensions 1`] = `
         data-test-subj="createShortUrl"
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         labelType="label"
diff --git a/src/plugins/unified_histogram/public/layout/layout.test.tsx b/src/plugins/unified_histogram/public/layout/layout.test.tsx
index 73b97c8f64def..3cb3fb254ecf7 100644
--- a/src/plugins/unified_histogram/public/layout/layout.test.tsx
+++ b/src/plugins/unified_histogram/public/layout/layout.test.tsx
@@ -118,7 +118,7 @@ describe('Layout', () => {
       const component = await mountComponent();
       setBreakpoint(component, 's');
       const expectedHeight = component.find(Panels).prop('topPanelHeight');
-      expect(component.find(Chart).childAt(0).getDOMNode()).toHaveStyle({
+      expect(component.find(Chart).find('div.euiFlexGroup').first().getDOMNode()).toHaveStyle({
         height: `${expectedHeight}px`,
       });
     });
@@ -127,7 +127,7 @@ describe('Layout', () => {
       const component = await mountComponent({ chart: { ...createChart(), hidden: true } });
       setBreakpoint(component, 's');
       const expectedHeight = component.find(Panels).prop('topPanelHeight');
-      expect(component.find(Chart).childAt(0).getDOMNode()).not.toHaveStyle({
+      expect(component.find(Chart).find('div.euiFlexGroup').first().getDOMNode()).not.toHaveStyle({
         height: `${expectedHeight}px`,
       });
     });
@@ -136,7 +136,7 @@ describe('Layout', () => {
       const component = await mountComponent({ chart: null });
       setBreakpoint(component, 's');
       const expectedHeight = component.find(Panels).prop('topPanelHeight');
-      expect(component.find(Chart).childAt(0).getDOMNode()).not.toHaveStyle({
+      expect(component.find(Chart).find('div.euiFlexGroup').first().getDOMNode()).not.toHaveStyle({
         height: `${expectedHeight}px`,
       });
     });
diff --git a/src/plugins/unified_search/public/search_bar/search_bar.test.tsx b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
index ea472a865290a..1eff11ac8215d 100644
--- a/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
+++ b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
@@ -284,7 +284,7 @@ describe('SearchBar', () => {
         },
       })
     );
-    const queryInput = component.find(QUERY_INPUT).at(0).getDOMNode();
+    const queryInput = component.find(QUERY_INPUT).last().getDOMNode();
     expect(queryInput.querySelector('textarea')).toBeDisabled();
     expect(queryInput.querySelector('[title="Clear input"]')).toBeNull();
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/_error.scss b/src/plugins/vis_types/timeseries/public/application/components/_error.scss
index fdfc747dbeb3e..becf8b3f280f8 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/_error.scss
+++ b/src/plugins/vis_types/timeseries/public/application/components/_error.scss
@@ -7,8 +7,8 @@
 // EUITODO: Convert to EuiCodeBlock
 .tvbError__stack {
   padding: $euiSizeS;
-  background: $euiCodeBlockBackgroundColor;
-  color: $euiCodeBlockColor;
+  background: $euiColorLightestShade;
+  color: $euiTextColor;
   line-height: $euiLineHeight;
   font-family: $euiCodeFontFamily;
   font-weight: $euiFontWeightRegular;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap b/src/plugins/vis_types/timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap
index fdfe472f46689..997f42509a923 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap
+++ b/src/plugins/vis_types/timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap
@@ -7,7 +7,6 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="42"
@@ -74,7 +73,6 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="42"
@@ -98,7 +96,6 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="42"
@@ -124,7 +121,6 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="42"
@@ -147,7 +143,6 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="42"
@@ -201,7 +196,6 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="42"
diff --git a/test/functional/apps/dashboard/group2/dashboard_snapshots.ts b/test/functional/apps/dashboard/group2/dashboard_snapshots.ts
index b020f6e91c9c5..99f7a7fe2654a 100644
--- a/test/functional/apps/dashboard/group2/dashboard_snapshots.ts
+++ b/test/functional/apps/dashboard/group2/dashboard_snapshots.ts
@@ -119,7 +119,7 @@ export default function ({
           'dashboard_controls_light',
           updateBaselines
         );
-        expect(percentDifference).to.be.lessThan(0.025);
+        expect(percentDifference).to.be.lessThan(0.06);
       });
 
       it('in dark mode', async () => {
@@ -133,7 +133,7 @@ export default function ({
           'dashboard_controls_dark',
           updateBaselines
         );
-        expect(percentDifference).to.be.lessThan(0.025);
+        expect(percentDifference).to.be.lessThan(0.07);
       });
 
       after(async () => {
diff --git a/test/functional/apps/dashboard_elements/controls/control_group_settings.ts b/test/functional/apps/dashboard_elements/controls/control_group_settings.ts
index 4648698ec0b5f..0f079774b3b53 100644
--- a/test/functional/apps/dashboard_elements/controls/control_group_settings.ts
+++ b/test/functional/apps/dashboard_elements/controls/control_group_settings.ts
@@ -65,10 +65,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         const controlIds = await dashboardControls.getAllControlIds();
         const firstControl = await find.byXPath(`//div[@data-control-id="${controlIds[0]}"]`);
         expect(await firstControl.elementHasClass('controlFrameWrapper--medium')).to.be(true);
-        expect(await firstControl.elementHasClass('euiFlexItem--flexGrowZero')).to.be(false);
+        expect(await firstControl.getAttribute('class')).not.to.contain('euiFlexItem-growZero');
         const secondControl = await find.byXPath(`//div[@data-control-id="${controlIds[1]}"]`);
         expect(await secondControl.elementHasClass('controlFrameWrapper--small')).to.be(true);
-        expect(await secondControl.elementHasClass('euiFlexItem--flexGrowZero')).to.be(true);
+        expect(await secondControl.getAttribute('class')).to.contain('euiFlexItem-growZero');
 
         await dashboardControls.openCreateControlFlyout();
         const smallWidthButton = await testSubjects.find('control-editor-width-small');
diff --git a/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx b/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx
index 51f9e38704910..5671c0c057b04 100644
--- a/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx
+++ b/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx
@@ -20,6 +20,8 @@ import {
   EuiTableSortingType,
   EuiToolTip,
   RIGHT_ALIGNMENT,
+  useEuiTheme,
+  euiPaletteColorBlind,
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
@@ -28,7 +30,6 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import type { ChangePoint } from '@kbn/ml-agg-utils';
 
 import { SEARCH_QUERY_LANGUAGE } from '../../application/utils/search_utils';
-import { useEuiTheme } from '../../hooks/use_eui_theme';
 import { useAiopsAppContext } from '../../hooks/use_aiops_app_context';
 
 import { MiniHistogram } from '../mini_histogram';
@@ -82,7 +83,8 @@ export const SpikeAnalysisGroupsTable: FC<SpikeAnalysisTableProps> = ({
     {}
   );
 
-  const euiTheme = useEuiTheme();
+  const { euiTheme } = useEuiTheme();
+  const visColors = euiPaletteColorBlind();
   const primaryBackgroundColor = useEuiBackgroundColor('primary');
 
   const { pinnedGroup, selectedGroup, setPinnedGroup, setSelectedGroup } =
@@ -260,9 +262,7 @@ export const SpikeAnalysisGroupsTable: FC<SpikeAnalysisTableProps> = ({
                   color="hollow"
                 >
                   <span>{`${fieldName}: `}</span>
-                  <span
-                    style={{ color: euiTheme.euiCodeBlockStringColor }}
-                  >{`${group[fieldName]}`}</span>
+                  <span style={{ color: visColors[2] }}>{`${group[fieldName]}`}</span>
                 </EuiBadge>
                 <EuiSpacer size="xs" />
               </>
@@ -479,12 +479,12 @@ export const SpikeAnalysisGroupsTable: FC<SpikeAnalysisTableProps> = ({
 
     if (selectedGroup && selectedGroup.id === group.id) {
       return {
-        backgroundColor: euiTheme.euiColorLightestShade,
+        backgroundColor: euiTheme.colors.lightestShade,
       };
     }
 
     return {
-      backgroundColor: euiTheme.euiColorEmptyShade,
+      backgroundColor: euiTheme.colors.emptyShade,
     };
   };
 
diff --git a/x-pack/plugins/apm/public/components/app/service_map/controls.tsx b/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
index ac74fade96fee..f562f2b0fd75e 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
@@ -19,9 +19,9 @@ import { getAnimationOptions, getNodeHeight } from './cytoscape_options';
 import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
 
 const ControlsContainer = euiStyled('div')`
-  left: ${({ theme }) => theme.eui.gutterTypes.gutterMedium};
+  left: ${({ theme }) => theme.eui.euiSize};
   position: absolute;
-  top: ${({ theme }) => theme.eui.gutterTypes.gutterSmall};
+  top: ${({ theme }) => theme.eui.euiSizeS};
   z-index: 1; /* The element containing the cytoscape canvas has z-index = 0. */
 `;
 
diff --git a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx b/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
index bf076b56bc373..84b0bcbd0dbc0 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
@@ -14,11 +14,11 @@ import { useTheme } from '../../../hooks/use_theme';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 
 const EmptyBannerContainer = euiStyled.div`
-  margin: ${({ theme }) => theme.eui.gutterTypes.gutterSmall};
+  margin: ${({ theme }) => theme.eui.euiSizeS};
   /* Add some extra margin so it displays to the right of the controls. */
   left: calc(
-    ${({ theme }) => theme.eui.gutterTypes.gutterExtraLarge} +
-      ${({ theme }) => theme.eui.gutterTypes.gutterSmall}
+    ${({ theme }) => theme.eui.euiSizeXXL} +
+      ${({ theme }) => theme.eui.euiSizeS}
   );
   position: absolute;
   z-index: 1;
@@ -54,8 +54,8 @@ export function EmptyBanner() {
   // subtract the space for controls and margins.
   const width =
     cy.width() -
-    parseInt(theme.eui.gutterTypes.gutterExtraLarge, 10) -
-    parseInt(theme.eui.gutterTypes.gutterLarge, 10);
+    parseInt(theme.eui.euiSizeXXL, 10) -
+    parseInt(theme.eui.euiSizeL, 10);
 
   return (
     <EmptyBannerContainer style={{ width }}>
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap
index f4f072140648a..2b5427b321cef 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`TransactionActionMenu component matches the snapshot 1`] = `
       class="euiPopover__anchor css-16vtueo-render"
     >
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
         type="button"
       >
         <span
diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_selector.js b/x-pack/plugins/canvas/public/components/datasource/datasource_selector.js
index cfa8d5319a8b6..6cfa005f92735 100644
--- a/x-pack/plugins/canvas/public/components/datasource/datasource_selector.js
+++ b/x-pack/plugins/canvas/public/components/datasource/datasource_selector.js
@@ -6,49 +6,29 @@
  */
 
 import React from 'react';
-import { css } from '@emotion/css';
 import PropTypes from 'prop-types';
 import { EuiCard, EuiIcon } from '@elastic/eui';
 
-export const DatasourceSelector = ({ onSelect, datasources, current }) => {
-  // TODO: custom css shouldn't be necessary after https://github.com/elastic/eui/issues/6345
-  // tested this placeholder fix on mac in Chrome, Firefox, Safari, and Edge
-  // with multiple zoom levels and with keyboard <tab> navigation
-  // and in a responsive design / mobile view
-  const cardStyles = css`
-    padding-bottom: 60px;
-    position: relative;
-
-    button {
-      position: absolute;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      border-radius: 0;
-    }
-  `;
-
-  return (
-    <div className="canvasDataSource__list">
-      {datasources.map((d) => (
-        <EuiCard
-          key={d.name}
-          title={d.displayName}
-          titleElement="h5"
-          titleSize="xs"
-          icon={<EuiIcon type={d.image} size="l" />}
-          description={d.help}
-          layout="horizontal"
-          className={`canvasDataSource__card ${cardStyles}`}
-          selectable={{
-            isSelected: d.name === current ? true : false,
-            onClick: () => onSelect(d.name),
-          }}
-        />
-      ))}
-    </div>
-  );
-};
+export const DatasourceSelector = ({ onSelect, datasources, current }) => (
+  <div className="canvasDataSource__list">
+    {datasources.map((d) => (
+      <EuiCard
+        key={d.name}
+        title={d.displayName}
+        titleElement="h5"
+        titleSize="xs"
+        icon={<EuiIcon type={d.image} size="l" />}
+        description={d.help}
+        layout="horizontal"
+        className="canvasDataSource__card"
+        selectable={{
+          isSelected: d.name === current ? true : false,
+          onClick: () => onSelect(d.name),
+        }}
+      />
+    ))}
+  </div>
+);
 
 DatasourceSelector.propTypes = {
   onSelect: PropTypes.func.isRequired,
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx
index e09ef9c48451f..531497670782d 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiButton, EuiFieldText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonSize } from '@elastic/eui/src/components/button/button';
-import { FlexGroupGutterSize } from '@elastic/eui/src/components/flex/flex_group';
+import { EuiFlexGroupGutterSize } from '@elastic/eui/src/components/flex/flex_group';
 import { getTimeInterval } from '../../../lib/time_interval';
 
 const strings = {
@@ -35,7 +35,7 @@ const strings = {
 };
 
 interface Props {
-  gutterSize: FlexGroupGutterSize;
+  gutterSize: EuiFlexGroupGutterSize;
   buttonSize: EuiButtonSize;
   onSubmit: (interval: number) => void;
   defaultValue: any;
diff --git a/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap
index 08a1ca1b09d06..381b9ce329d00 100644
--- a/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap
@@ -126,16 +126,16 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
         style="bottom: 0px;"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem title"
+            class="euiFlexItem title emotion-euiFlexItem-grow-1"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="flex-shrink: 0;"
               >
                 <a
@@ -150,7 +150,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
                 </a>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="min-width: 0; cursor: default;"
               >
                 <div
@@ -166,17 +166,17 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                 style="margin: 0px 12px;"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Previous Page"
@@ -194,7 +194,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     class="euiButtonEmpty euiButtonEmpty--small css-14l66eu-empty-text"
@@ -217,7 +217,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Next Page"
@@ -236,10 +236,10 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
                 </div>
               </div>
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-flexEnd-column"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class="euiPopover emotion-euiPopover"
@@ -400,16 +400,16 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
         style="bottom: 0px;"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem title"
+            class="euiFlexItem title emotion-euiFlexItem-grow-1"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="flex-shrink: 0;"
               >
                 <a
@@ -424,7 +424,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
                 </a>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="min-width: 0; cursor: default;"
               >
                 <div
@@ -440,17 +440,17 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                 style="margin: 0px 12px;"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Previous Page"
@@ -468,7 +468,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     class="euiButtonEmpty euiButtonEmpty--small css-14l66eu-empty-text"
@@ -491,7 +491,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Next Page"
@@ -510,10 +510,10 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
                 </div>
               </div>
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-flexEnd-column"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class="euiPopover emotion-euiPopover"
@@ -674,16 +674,16 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
         style="bottom: 0px;"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem title"
+            class="euiFlexItem title emotion-euiFlexItem-grow-1"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="flex-shrink: 0;"
               >
                 <a
@@ -698,7 +698,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
                 </a>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="min-width: 0; cursor: default;"
               >
                 <div
@@ -714,17 +714,17 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                 style="margin: 0px 12px;"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Previous Page"
@@ -742,7 +742,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     class="euiButtonEmpty euiButtonEmpty--small css-14l66eu-empty-text"
@@ -765,7 +765,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Next Page"
@@ -784,10 +784,10 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
                 </div>
               </div>
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-flexEnd-column"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class="euiPopover emotion-euiPopover"
@@ -949,16 +949,16 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
         style="bottom: 0px;"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem title"
+            class="euiFlexItem title emotion-euiFlexItem-grow-1"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="flex-shrink: 0;"
               >
                 <a
@@ -973,7 +973,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
                 </a>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="min-width: 0; cursor: default;"
               >
                 <div
@@ -989,17 +989,17 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                 style="margin: 0px 12px;"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Previous Page"
@@ -1017,7 +1017,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     class="euiButtonEmpty euiButtonEmpty--small css-14l66eu-empty-text"
@@ -1040,7 +1040,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Next Page"
@@ -1059,10 +1059,10 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
                 </div>
               </div>
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-flexEnd-column"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class="euiPopover emotion-euiPopover"
@@ -1223,16 +1223,16 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
         style="bottom: 0px;"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem title"
+            class="euiFlexItem title emotion-euiFlexItem-grow-1"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="flex-shrink: 0;"
               >
                 <a
@@ -1247,7 +1247,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
                 </a>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
                 style="min-width: 0; cursor: default;"
               >
                 <div
@@ -1263,17 +1263,17 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                 style="margin: 0px 12px;"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Previous Page"
@@ -1291,7 +1291,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     class="euiButtonEmpty euiButtonEmpty--small css-14l66eu-empty-text"
@@ -1314,7 +1314,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
                   </button>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <button
                     aria-label="Next Page"
@@ -1333,10 +1333,10 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
                 </div>
               </div>
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-flexEnd-column"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class="euiPopover emotion-euiPopover"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
index 341f973a2d9fe..afa514ed0df48 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
@@ -222,7 +222,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                 style="padding: 16px;"
               >
                 <div
-                  class="euiSwitch"
+                  class="euiSwitch emotion-euiSwitch"
                 >
                   <button
                     aria-checked="false"
@@ -265,10 +265,10 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                 />
                 <form>
                   <div
-                    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
                   >
                     <div
-                      class="euiFlexItem"
+                      class="euiFlexItem emotion-euiFlexItem-grow-1"
                     >
                       <div
                         class="euiFormRow euiFormRow--hasLabel euiFormRow--compressed"
@@ -314,7 +314,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                       </div>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
+                      class="euiFlexItem emotion-euiFlexItem-growZero"
                     >
                       <div
                         class="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--compressed"
@@ -583,7 +583,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiSwitch"
+                      class="euiSwitch emotion-euiSwitch"
                     >
                       <button
                         aria-checked="false"
@@ -769,7 +769,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] =
                     class="euiFormRow__fieldWrapper"
                   >
                     <div
-                      class="euiSwitch"
+                      class="euiSwitch emotion-euiSwitch"
                     >
                       <button
                         aria-checked="true"
diff --git a/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx b/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx
index ca6434aa11c26..ddf3c7845f240 100644
--- a/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/cases_metrics.tsx
@@ -24,16 +24,10 @@ import { ATTC_DESCRIPTION, ATTC_STAT } from './translations';
 
 const MetricsFlexGroup = styled.div`
   ${({ theme }) => css`
-    .euiFlexGroup {
-      border: ${theme.eui.euiBorderThin};
-      border-radius: ${theme.eui.euiBorderRadius};
-      margin: 0 0 ${theme.eui.euiSizeL} 0;
-    }
-    @media only screen and (max-width: ${theme.eui.euiBreakpoints.s}) {
-      .euiFlexGroup {
-        padding: ${theme.eui.euiSizeM};
-      }
-    }
+    border: ${theme.eui.euiBorderThin};
+    border-radius: ${theme.eui.euiBorderRadius};
+    padding: ${theme.eui.euiSizeM};
+    margin-bottom: ${theme.eui.euiSizeL};
   `}
 `;
 
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/cloud_summary_section.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/cloud_summary_section.tsx
index 4168beb2ffd30..5c7bc96f798ac 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/cloud_summary_section.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/cloud_summary_section.tsx
@@ -6,9 +6,8 @@
  */
 
 import React, { useMemo } from 'react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiFlexItemProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FlexItemGrowSize } from '@elastic/eui/src/components/flex/flex_item';
 import { statusColors } from '../../../common/constants';
 import { DASHBOARD_COUNTER_CARDS } from '../test_subjects';
 import { CspCounterCard, CspCounterCardProps } from '../../../components/csp_counter_card';
@@ -23,7 +22,7 @@ import {
 } from '../../../common/hooks/use_navigate_findings';
 import { RULE_FAILED } from '../../../../common/constants';
 
-export const dashboardColumnsGrow: Record<string, FlexItemGrowSize> = {
+export const dashboardColumnsGrow: Record<string, EuiFlexItemProps['grow']> = {
   first: 3,
   second: 8,
   third: 8,
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/home.test.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/home.test.js
index b4b8009aedc3c..c51fc6c4cbeff 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/home.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/home.test.js
@@ -44,7 +44,7 @@ describe('<CrossClusterReplicationHome />', () => {
     });
 
     test('should set the default selected tab to "Follower indices"', () => {
-      expect(component.find('.euiTab-isSelected').text()).toBe('Follower indices');
+      expect(component.find('button.euiTab-isSelected').text()).toBe('Follower indices');
 
       // Verify that the <FollowerIndicesList /> component is rendered
       expect(component.find('FollowerIndicesList').length).toBe(1);
@@ -59,7 +59,7 @@ describe('<CrossClusterReplicationHome />', () => {
       await nextTick();
       component.update();
 
-      expect(component.find('.euiTab-isSelected').text()).toBe('Auto-follow patterns');
+      expect(component.find('button.euiTab-isSelected').text()).toBe('Auto-follow patterns');
 
       // Verify that the <AutoFollowPatternList /> component is rendered
       expect(component.find('AutoFollowPatternList').length).toBe(1);
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
index 87caa0386da94..f638ac8002810 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC, ReactNode } from 'react';
-import { EuiFlexGrid } from '@elastic/eui';
+import { EuiFlexGroup } from '@elastic/eui';
 
 interface Props {
   children: ReactNode;
@@ -14,8 +14,8 @@ interface Props {
 }
 export const ExpandedRowContent: FC<Props> = ({ children, dataTestSubj }) => {
   return (
-    <EuiFlexGrid data-test-subj={dataTestSubj} gutterSize={'s'}>
+    <EuiFlexGroup data-test-subj={dataTestSubj} gutterSize={'s'}>
       {children}
-    </EuiFlexGrid>
+    </EuiFlexGroup>
   );
 };
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
index 8b69f7d742489..4448d42bdd455 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
@@ -6,7 +6,6 @@ exports[`Overrides render overrides 1`] = `
     describedByIds={Array []}
     display="row"
     error="Value must be greater than 3 and less than or equal to 1000000"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
@@ -27,7 +26,6 @@ exports[`Overrides render overrides 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
@@ -76,7 +74,6 @@ exports[`Overrides render overrides 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText={
@@ -329,7 +326,6 @@ exports[`Overrides render overrides 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx
index 09080789d62be..e7e24dcfb71e6 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx
@@ -44,7 +44,7 @@ import { PackagePolicyInputVarField } from './components';
 // on smaller screens, fields should be displayed in one column
 const FormGroupResponsiveFields = styled(EuiDescribedFormGroup)`
   @media (max-width: 767px) {
-    .euiFlexGroup--responsive {
+    [class*='euiFlexGroup-responsive'] {
       align-items: flex-start;
     }
   }
diff --git a/x-pack/plugins/graph/public/components/settings/settings.test.tsx b/x-pack/plugins/graph/public/components/settings/settings.test.tsx
index 91da7a64f1804..0ad5eb2026257 100644
--- a/x-pack/plugins/graph/public/components/settings/settings.test.tsx
+++ b/x-pack/plugins/graph/public/components/settings/settings.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { EuiTab, EuiListGroupItem, EuiAccordion, EuiFieldText } from '@elastic/eui';
+import { EuiListGroupItem, EuiAccordion, EuiFieldText } from '@elastic/eui';
 import * as Rx from 'rxjs';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { Settings, SettingsWorkspaceProps } from './settings';
@@ -158,12 +158,9 @@ describe('settings', () => {
     );
   });
 
-  function toTab(tab: string) {
+  function toTab(testSubj: string) {
     act(() => {
-      instance
-        .find(EuiTab)
-        .findWhere((node) => node.key() === tab)
-        .prop('onClick')!({});
+      instance.find(`EuiTab[data-test-subj="${testSubj}"]`).prop('onClick')!({} as any);
     });
     instance.update();
   }
@@ -217,7 +214,7 @@ describe('settings', () => {
 
   describe('blocklist', () => {
     beforeEach(() => {
-      toTab('Block list');
+      toTab('blocklist');
     });
 
     it('should switch tab to blocklist', () => {
@@ -288,7 +285,7 @@ describe('settings', () => {
     }
 
     beforeEach(() => {
-      toTab('Drilldowns');
+      toTab('drillDowns');
     });
 
     it('should switch tab to url templates', () => {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
index 404adedd4ce20..7d7a293d7ae87 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
@@ -128,10 +128,10 @@ Array [
     class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
   />,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList emotion-euiDescriptionList-column-left"
@@ -182,7 +182,7 @@ Array [
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList emotion-euiDescriptionList-column-left"
@@ -255,10 +255,10 @@ Array [
     class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
   />,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList emotion-euiDescriptionList-column-left"
@@ -309,7 +309,7 @@ Array [
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList emotion-euiDescriptionList-column-left"
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
index b93f312a8d782..66208af1dbbfe 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
@@ -80,7 +80,7 @@ exports[`policy table shows empty state when there are no policies 1`] = `
             class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
           />
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="createPolicyButton"
             type="button"
           >
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/home.test.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/home.test.ts
index c3f8a5b17068d..16761dc23679c 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/home.test.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/home.test.ts
@@ -54,7 +54,7 @@ describe('<IndexManagementHome />', () => {
         const { find } = testBed;
 
         const indexManagementContainer = find('indexManagementHeaderContent');
-        const tabListContainer = indexManagementContainer.find('.euiTabs');
+        const tabListContainer = indexManagementContainer.find('div.euiTabs');
         const allTabs = tabListContainer.children();
         const allTabsLabels = ['Indices', 'Data Streams', 'Index Templates', 'Component Templates'];
 
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.test.tsx b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.test.tsx
index a0ddca3c5d2bb..f0b50758a7168 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.test.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.test.tsx
@@ -445,10 +445,10 @@ describe('<TemplateCreate />', () => {
       test('should have 3 tabs', () => {
         const { find } = testBed;
 
-        expect(find('summaryTabContent').find('.euiTab').length).toBe(3);
+        expect(find('summaryTabContent').find('button.euiTab').length).toBe(3);
         expect(
           find('summaryTabContent')
-            .find('.euiTab')
+            .find('button.euiTab')
             .map((t) => t.text())
         ).toEqual(['Summary', 'Preview', 'Request']);
       });
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_form.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_form.helpers.ts
index cf7f2a4af0b61..25da097065e07 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_form.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_form.helpers.ts
@@ -124,7 +124,11 @@ export const formSetup = async (initTestBed: SetupFunc<TestSubjects>) => {
       const tabs = ['summary', 'preview', 'request'];
 
       await act(async () => {
-        testBed.find('summaryTabContent').find('.euiTab').at(tabs.indexOf(tab)).simulate('click');
+        testBed
+          .find('summaryTabContent')
+          .find('button.euiTab')
+          .at(tabs.indexOf(tab))
+          .simulate('click');
       });
 
       testBed.component.update();
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
index 01a82696d9aea..5e915c526dc44 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
@@ -134,10 +134,10 @@ describe('<ComponentTemplateCreate />', () => {
         );
 
         // Verify 2 tabs exist
-        expect(find('stepReview.content').find('.euiTab').length).toBe(2);
+        expect(find('stepReview.content').find('button.euiTab').length).toBe(2);
         expect(
           find('stepReview.content')
-            .find('.euiTab')
+            .find('button.euiTab')
             .map((t) => t.text())
         ).toEqual(['Summary', 'Request']);
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts
index 3dc7d3e857d29..2aaadf3c06f11 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts
@@ -45,7 +45,11 @@ export const getFormActions = (testBed: TestBed) => {
   const selectReviewTab = (tab: 'summary' | 'request') => {
     const tabs = ['summary', 'request'];
 
-    testBed.find('stepReview.content').find('.euiTab').at(tabs.indexOf(tab)).simulate('click');
+    testBed
+      .find('stepReview.content')
+      .find('button.euiTab')
+      .at(tabs.indexOf(tab))
+      .simulate('click');
   };
 
   const completeStepLogistics = async ({ name }: { name: string }) => {
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/code_block.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/code_block.tsx
index 07a8aa5c98cab..35856d577d149 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/code_block.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/code_block.tsx
@@ -6,26 +6,13 @@
  */
 
 import React from 'react';
-
-/**
- * The <EuiCode /> component expect the children provided to be a string (html).
- * This component allows both string and JSX element
- *
- * TODO: Open PR on eui repo to allow both string and React.Node to be passed as children of <EuiCode />
- */
+import { EuiCodeBlock } from '@elastic/eui';
 
 interface Props {
-  children: React.ReactNode;
+  children: React.ReactNode; // Note - ReactNodes (vs strings) will not have syntax highlighting
   padding?: 'small' | 'normal';
 }
 
 export const CodeBlock = ({ children, padding = 'normal' }: Props) => (
-  <div className="euiCodeBlock euiCodeBlock--fontSmall euiCodeBlock--paddingLarge">
-    <pre
-      className="euiCodeBlock__pre"
-      style={{ padding: padding === 'small' ? '6px 12px' : undefined }}
-    >
-      <code className="euiCodeBlock__code">{children}</code>
-    </pre>
-  </div>
+  <EuiCodeBlock paddingSize={padding === 'normal' ? 'l' : 's'}>{children}</EuiCodeBlock>
 );
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker_tooltip.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker_tooltip.tsx
index 31c3624b2d86c..a451241ce1bb4 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker_tooltip.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker_tooltip.tsx
@@ -8,6 +8,7 @@
 import { calculatePopoverPosition, EuiPortal, withEuiTheme, WithEuiThemeProps } from '@elastic/eui';
 // @ts-expect-error style types not defined
 import { euiToolTipStyles } from '@elastic/eui/lib/components/tool_tip/tool_tip.styles';
+import { css } from '@emotion/react';
 import * as React from 'react';
 
 import { AutoSizer } from '../../auto_sizer';
@@ -43,7 +44,7 @@ export class _SearchMarkerTooltip extends React.PureComponent<
 
               return (
                 <div
-                  css={[styles.euiToolTip, styles.left]}
+                  css={css([styles.euiToolTip, styles.left])}
                   style={{
                     left,
                     top,
@@ -51,8 +52,7 @@ export class _SearchMarkerTooltip extends React.PureComponent<
                   ref={measureRef}
                 >
                   <div
-                    css={[styles.euiToolTip__arrow]} // TODO: Add styles.arrowPositions.left in next Kibana EUI upgrade
-                    className="euiToolTip__arrow" // TODO: Remove this when the above is done
+                    css={css([styles.euiToolTip__arrow, styles.arrowPositions.left])}
                     style={{ left: width || 0, top: (height || 0) / 2 - POPOVER_ARROW_SIZE / 2 }}
                   />
                   <div>{children}</div>
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
index 6dff4b41ecf53..15714295e062f 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
@@ -299,7 +299,7 @@ export const ResultsContentPage = euiStyled(EuiPage)`
   flex: 1 0 0%;
   flex-direction: column;
 
-  .euiFlexGroup--responsive > .euiFlexItem {
+  [class*="euiFlexGroup-responsive"] > .euiFlexItem {
     flex-basis: auto !important;
   }
 `;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/__snapshots__/conditional_tooltip.test.tsx.snap b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/__snapshots__/conditional_tooltip.test.tsx.snap
index 91bafb3b15e4d..5c3b53bb551c8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/__snapshots__/conditional_tooltip.test.tsx.snap
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/__snapshots__/conditional_tooltip.test.tsx.snap
@@ -3,214 +3,108 @@
 exports[`ConditionalToolTip renders correctly 1`] = `
 <div
   data-test-subj="conditionalTooltipContent-host-01"
-  style={
-    Object {
-      "minWidth": 200,
-    }
-  }
+  style="min-width: 200px;"
 >
   <div
-    style={
-      Object {
-        "borderBottom": "1px solid #98a2b3",
-        "marginBottom": "4px",
-        "paddingBottom": "4px",
-      }
-    }
+    style="border-bottom: 1px solid #98a2b3; padding-bottom: 4px; margin-bottom: 4px;"
   >
     host-01
   </div>
-  <EuiFlexGroup
-    gutterSize="s"
-    key="cpu"
+  <div
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
   >
     <div
-      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexItem eui-textTruncate eui-displayBlock emotion-euiFlexItem-grow-1"
+      data-test-subj="conditionalTooltipContent-metric"
+    >
+      CPU usage
+    </div>
+    <div
+      class="euiFlexItem emotion-euiFlexItem-growZero"
+      data-test-subj="conditionalTooltipContent-value"
     >
-      <EuiFlexItem
-        className="eui-textTruncate eui-displayBlock"
-        data-test-subj="conditionalTooltipContent-metric"
-        grow={1}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrow1 eui-textTruncate eui-displayBlock"
-          data-test-subj="conditionalTooltipContent-metric"
-        >
-          CPU usage
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem
-        data-test-subj="conditionalTooltipContent-value"
-        grow={false}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-          data-test-subj="conditionalTooltipContent-value"
-        >
-          10%
-        </div>
-      </EuiFlexItem>
+      10%
     </div>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    gutterSize="s"
-    key="memory"
+  </div>
+  <div
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
   >
     <div
-      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexItem eui-textTruncate eui-displayBlock emotion-euiFlexItem-grow-1"
+      data-test-subj="conditionalTooltipContent-metric"
     >
-      <EuiFlexItem
-        className="eui-textTruncate eui-displayBlock"
-        data-test-subj="conditionalTooltipContent-metric"
-        grow={1}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrow1 eui-textTruncate eui-displayBlock"
-          data-test-subj="conditionalTooltipContent-metric"
-        >
-          Memory usage
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem
-        data-test-subj="conditionalTooltipContent-value"
-        grow={false}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-          data-test-subj="conditionalTooltipContent-value"
-        >
-          80%
-        </div>
-      </EuiFlexItem>
+      Memory usage
     </div>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    gutterSize="s"
-    key="tx"
+    <div
+      class="euiFlexItem emotion-euiFlexItem-growZero"
+      data-test-subj="conditionalTooltipContent-value"
+    >
+      80%
+    </div>
+  </div>
+  <div
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
   >
     <div
-      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexItem eui-textTruncate eui-displayBlock emotion-euiFlexItem-grow-1"
+      data-test-subj="conditionalTooltipContent-metric"
     >
-      <EuiFlexItem
-        className="eui-textTruncate eui-displayBlock"
-        data-test-subj="conditionalTooltipContent-metric"
-        grow={1}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrow1 eui-textTruncate eui-displayBlock"
-          data-test-subj="conditionalTooltipContent-metric"
-        >
-          Outbound traffic
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem
-        data-test-subj="conditionalTooltipContent-value"
-        grow={false}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-          data-test-subj="conditionalTooltipContent-value"
-        >
-          8Mbit/s
-        </div>
-      </EuiFlexItem>
+      Outbound traffic
     </div>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    gutterSize="s"
-    key="rx"
+    <div
+      class="euiFlexItem emotion-euiFlexItem-growZero"
+      data-test-subj="conditionalTooltipContent-value"
+    >
+      8Mbit/s
+    </div>
+  </div>
+  <div
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
   >
     <div
-      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexItem eui-textTruncate eui-displayBlock emotion-euiFlexItem-grow-1"
+      data-test-subj="conditionalTooltipContent-metric"
+    >
+      Inbound traffic
+    </div>
+    <div
+      class="euiFlexItem emotion-euiFlexItem-growZero"
+      data-test-subj="conditionalTooltipContent-value"
     >
-      <EuiFlexItem
-        className="eui-textTruncate eui-displayBlock"
-        data-test-subj="conditionalTooltipContent-metric"
-        grow={1}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrow1 eui-textTruncate eui-displayBlock"
-          data-test-subj="conditionalTooltipContent-metric"
-        >
-          Inbound traffic
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem
-        data-test-subj="conditionalTooltipContent-value"
-        grow={false}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-          data-test-subj="conditionalTooltipContent-value"
-        >
-          8Mbit/s
-        </div>
-      </EuiFlexItem>
+      8Mbit/s
     </div>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    gutterSize="s"
-    key="cedd6ca0-5775-11eb-a86f-adb714b6c486"
+  </div>
+  <div
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
   >
     <div
-      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexItem eui-textTruncate eui-displayBlock emotion-euiFlexItem-grow-1"
+      data-test-subj="conditionalTooltipContent-metric"
     >
-      <EuiFlexItem
-        className="eui-textTruncate eui-displayBlock"
-        data-test-subj="conditionalTooltipContent-metric"
-        grow={1}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrow1 eui-textTruncate eui-displayBlock"
-          data-test-subj="conditionalTooltipContent-metric"
-        >
-          My Custom Label
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem
-        data-test-subj="conditionalTooltipContent-value"
-        grow={false}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-          data-test-subj="conditionalTooltipContent-value"
-        >
-          34.1%
-        </div>
-      </EuiFlexItem>
+      My Custom Label
     </div>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    gutterSize="s"
-    key="e12dd700-5775-11eb-a86f-adb714b6c486"
+    <div
+      class="euiFlexItem emotion-euiFlexItem-growZero"
+      data-test-subj="conditionalTooltipContent-value"
+    >
+      34.1%
+    </div>
+  </div>
+  <div
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
   >
     <div
-      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexItem eui-textTruncate eui-displayBlock emotion-euiFlexItem-grow-1"
+      data-test-subj="conditionalTooltipContent-metric"
     >
-      <EuiFlexItem
-        className="eui-textTruncate eui-displayBlock"
-        data-test-subj="conditionalTooltipContent-metric"
-        grow={1}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrow1 eui-textTruncate eui-displayBlock"
-          data-test-subj="conditionalTooltipContent-metric"
-        >
-          Avg of host.network.out.packets
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem
-        data-test-subj="conditionalTooltipContent-value"
-        grow={false}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-          data-test-subj="conditionalTooltipContent-value"
-        >
-          4,392.2
-        </div>
-      </EuiFlexItem>
+      Avg of host.network.out.packets
     </div>
-  </EuiFlexGroup>
+    <div
+      class="euiFlexItem emotion-euiFlexItem-growZero"
+      data-test-subj="conditionalTooltipContent-value"
+    >
+      4,392.2
+    </div>
+  </div>
 </div>
 `;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
index 0f517b1f12aee..2a96896e03bc2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
@@ -7,7 +7,6 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ConditionalToolTip } from './conditional_tooltip';
 import { InfraWaffleMapNode } from '../../../../../lib/lib';
@@ -102,7 +101,7 @@ describe('ConditionalToolTip', () => {
       </EuiThemeProvider>
     );
     const tooltip = wrapper.find('[data-test-subj~="conditionalTooltipContent-host-01"]');
-    expect(toJson(tooltip)).toMatchSnapshot();
+    expect(tooltip.render()).toMatchSnapshot();
 
     expect(mockedUseSnapshot).toBeCalledWith(
       expectedQuery,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.scss b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.scss
index 1a7cf1fd787e6..a307db67724a0 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.scss
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.scss
@@ -34,6 +34,7 @@
 }
 
 .lnsIndexPatternDimensionEditor__columns {
+  display: block;
   column-count: 2;
   column-gap: $euiSizeM;
 }
@@ -45,6 +46,7 @@
 .lnsIndexPatternDimensionEditor__operation > button {
   padding-top: 0;
   padding-bottom: 0;
+  min-block-size: $euiSizeL;
 }
 
 .lnsIndexPatternDimensionEditor__warning {
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap
index 6d03d210827d3..161a547cb3db0 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap
@@ -2,90 +2,98 @@
 
 exports[`AddLicense component when license is active should display correct verbiage 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
 >
   <div
-    class="euiCard__content emotion-euiCard__content-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-center"
-      >
-        Update your license
-      </span>
-    </p>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        If you already have a new license, upload it now.
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-center"
+        >
+          Update your license
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          If you already have a new license, upload it now.
+        </p>
+      </div>
     </div>
-  </div>
-  <div
-    class="emotion-euiCard__footer"
-  >
-    <a
-      class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-      data-test-subj="updateLicenseButton"
-      href="/upload_license"
-      rel="noreferrer"
+    <div
+      class="emotion-euiCard__footer"
     >
-      <span
-        class="emotion-euiButtonDisplayContent"
+      <a
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+        data-test-subj="updateLicenseButton"
+        href="/upload_license"
+        rel="noreferrer"
       >
-        Update license
-      </span>
-    </a>
+        <span
+          class="emotion-euiButtonDisplayContent"
+        >
+          Update license
+        </span>
+      </a>
+    </div>
   </div>
 </div>
 `;
 
 exports[`AddLicense component when license is expired should display with correct verbiage 1`] = `
 <div
-  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+  class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
 >
   <div
-    class="euiCard__content emotion-euiCard__content-vertical"
+    class="euiCard__main emotion-euiCard__main-vertical"
   >
-    <p
-      class="euiTitle euiCard__title emotion-euiTitle-s"
-      id="generated-idTitle"
-    >
-      <span
-        class="emotion-euiCard__text-center"
-      >
-        Update your license
-      </span>
-    </p>
     <div
-      class="euiText emotion-euiText-s-euiCard__description"
-      id="generated-idDescription"
+      class="euiCard__content emotion-euiCard__content-vertical"
     >
-      <p>
-        If you already have a new license, upload it now.
+      <p
+        class="euiTitle euiCard__title emotion-euiTitle-s"
+        id="generated-idTitle"
+      >
+        <span
+          class="emotion-euiCard__text-center"
+        >
+          Update your license
+        </span>
       </p>
+      <div
+        class="euiText emotion-euiText-s-euiCard__description"
+        id="generated-idDescription"
+      >
+        <p>
+          If you already have a new license, upload it now.
+        </p>
+      </div>
     </div>
-  </div>
-  <div
-    class="emotion-euiCard__footer"
-  >
-    <a
-      class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-      data-test-subj="updateLicenseButton"
-      href="/upload_license"
-      rel="noreferrer"
+    <div
+      class="emotion-euiCard__footer"
     >
-      <span
-        class="emotion-euiButtonDisplayContent"
+      <a
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+        data-test-subj="updateLicenseButton"
+        href="/upload_license"
+        rel="noreferrer"
       >
-        Update license
-      </span>
-    </a>
+        <span
+          class="emotion-euiButtonDisplayContent"
+        >
+          Update license
+        </span>
+      </a>
+    </div>
   </div>
 </div>
 `;
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/license_page_header.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/license_page_header.test.js.snap
index a8f3ff4edd5f2..e055c34b29c6c 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/license_page_header.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/license_page_header.test.js.snap
@@ -9,10 +9,10 @@ Array [
       class="euiPageHeaderContent emotion-euiPageHeaderContent-border-l"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+        class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <h1
             class="euiTitle emotion-euiTitle-l"
@@ -62,10 +62,10 @@ Array [
       class="euiPageHeaderContent emotion-euiPageHeaderContent-border-l"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive euiPageHeaderContent__top"
+        class="euiFlexGroup euiPageHeaderContent__top emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
       >
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <h1
             class="euiTitle emotion-euiTitle-l"
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
index e1caddf088bf9..16119656ce53b 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
@@ -2,71 +2,75 @@
 
 exports[`RequestTrialExtension component should display when enterprise license is not active and trial has been used 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Extend your trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            If you’d like to continue using machine learning, advanced security, and our other awesome 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-            , request an extension now.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Extend your trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              If you’d like to continue using machine learning, advanced security, and our other awesome 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+              , request an extension now.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <a
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="extendTrialButton"
-        href="https://www.elastic.co/trialextension"
-        rel="noopener"
-        target="_blank"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <a
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="extendTrialButton"
+          href="https://www.elastic.co/trialextension"
+          rel="noopener"
+          target="_blank"
         >
-          Extend trial
-        </span>
-      </a>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Extend trial
+          </span>
+        </a>
+      </div>
     </div>
   </div>
 </div>
@@ -74,71 +78,75 @@ exports[`RequestTrialExtension component should display when enterprise license
 
 exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Extend your trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            If you’d like to continue using machine learning, advanced security, and our other awesome 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-            , request an extension now.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Extend your trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              If you’d like to continue using machine learning, advanced security, and our other awesome 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+              , request an extension now.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <a
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="extendTrialButton"
-        href="https://www.elastic.co/trialextension"
-        rel="noopener"
-        target="_blank"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <a
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="extendTrialButton"
+          href="https://www.elastic.co/trialextension"
+          rel="noopener"
+          target="_blank"
         >
-          Extend trial
-        </span>
-      </a>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Extend trial
+          </span>
+        </a>
+      </div>
     </div>
   </div>
 </div>
@@ -146,71 +154,75 @@ exports[`RequestTrialExtension component should display when license is active a
 
 exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Extend your trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            If you’d like to continue using machine learning, advanced security, and our other awesome 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-            , request an extension now.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Extend your trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              If you’d like to continue using machine learning, advanced security, and our other awesome 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+              , request an extension now.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <a
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="extendTrialButton"
-        href="https://www.elastic.co/trialextension"
-        rel="noopener"
-        target="_blank"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <a
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="extendTrialButton"
+          href="https://www.elastic.co/trialextension"
+          rel="noopener"
+          target="_blank"
         >
-          Extend trial
-        </span>
-      </a>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Extend trial
+          </span>
+        </a>
+      </div>
     </div>
   </div>
 </div>
@@ -218,71 +230,75 @@ exports[`RequestTrialExtension component should display when license is not acti
 
 exports[`RequestTrialExtension component should display when platinum license is not active and trial has been used 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Extend your trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            If you’d like to continue using machine learning, advanced security, and our other awesome 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-            , request an extension now.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Extend your trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              If you’d like to continue using machine learning, advanced security, and our other awesome 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+              , request an extension now.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <a
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="extendTrialButton"
-        href="https://www.elastic.co/trialextension"
-        rel="noopener"
-        target="_blank"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <a
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="extendTrialButton"
+          href="https://www.elastic.co/trialextension"
+          rel="noopener"
+          target="_blank"
         >
-          Extend trial
-        </span>
-      </a>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Extend trial
+          </span>
+        </a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap
index 0324a249e400e..1dc2304abc071 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap
@@ -2,69 +2,73 @@
 
 exports[`RevertToBasic component should display when license is about to expire 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Revert to Basic license
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            You’ll revert to our free features and lose access to machine learning, advanced security, and other 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-            .
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Revert to Basic license
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              You’ll revert to our free features and lose access to machine learning, advanced security, and other 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+              .
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="revertToBasicButton"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="revertToBasicButton"
+          type="button"
         >
-          Revert to Basic
-        </span>
-      </button>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Revert to Basic
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -72,69 +76,73 @@ exports[`RevertToBasic component should display when license is about to expire
 
 exports[`RevertToBasic component should display when license is expired 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Revert to Basic license
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            You’ll revert to our free features and lose access to machine learning, advanced security, and other 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-            .
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Revert to Basic license
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              You’ll revert to our free features and lose access to machine learning, advanced security, and other 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+              .
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="revertToBasicButton"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="revertToBasicButton"
+          type="button"
         >
-          Revert to Basic
-        </span>
-      </button>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Revert to Basic
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -142,69 +150,73 @@ exports[`RevertToBasic component should display when license is expired 1`] = `
 
 exports[`RevertToBasic component should display when trial is active 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Revert to Basic license
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            You’ll revert to our free features and lose access to machine learning, advanced security, and other 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-            .
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Revert to Basic license
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              You’ll revert to our free features and lose access to machine learning, advanced security, and other 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+              .
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="revertToBasicButton"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="revertToBasicButton"
+          type="button"
         >
-          Revert to Basic
-        </span>
-      </button>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Revert to Basic
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap
index 3bc99f172275b..0f13544c3ee1b 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap
@@ -2,69 +2,73 @@
 
 exports[`StartTrial component when trial is allowed display for basic license 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Start a 30-day trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            Experience what machine learning, advanced security, and all our other 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-             have to offer.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Start a 30-day trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              Experience what machine learning, advanced security, and all our other 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+               have to offer.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="startTrialButton"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="startTrialButton"
+          type="button"
         >
-          Start trial
-        </span>
-      </button>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Start trial
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -72,69 +76,73 @@ exports[`StartTrial component when trial is allowed display for basic license 1`
 
 exports[`StartTrial component when trial is allowed should display for expired enterprise license 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Start a 30-day trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            Experience what machine learning, advanced security, and all our other 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-             have to offer.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Start a 30-day trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              Experience what machine learning, advanced security, and all our other 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+               have to offer.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="startTrialButton"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="startTrialButton"
+          type="button"
         >
-          Start trial
-        </span>
-      </button>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Start trial
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -142,69 +150,73 @@ exports[`StartTrial component when trial is allowed should display for expired e
 
 exports[`StartTrial component when trial is allowed should display for expired platinum license 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Start a 30-day trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            Experience what machine learning, advanced security, and all our other 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-             have to offer.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Start a 30-day trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              Experience what machine learning, advanced security, and all our other 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+               have to offer.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="startTrialButton"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="startTrialButton"
+          type="button"
         >
-          Start trial
-        </span>
-      </button>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Start trial
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </div>
@@ -212,69 +224,73 @@ exports[`StartTrial component when trial is allowed should display for expired p
 
 exports[`StartTrial component when trial is allowed should display for gold license 1`] = `
 <div
-  class="euiFlexItem"
+  class="euiFlexItem emotion-euiFlexItem-grow-1"
 >
   <div
-    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center-vertical"
+    class="euiPanel euiPanel--plain euiPanel--paddingMedium euiCard emotion-euiPanel-grow-m-m-plain-hasBorder-euiCard-center"
   >
     <div
-      class="euiCard__content emotion-euiCard__content-vertical"
+      class="euiCard__main emotion-euiCard__main-vertical"
     >
-      <p
-        class="euiTitle euiCard__title emotion-euiTitle-s"
-        id="generated-idTitle"
-      >
-        <span
-          class="emotion-euiCard__text-center"
-        >
-          Start a 30-day trial
-        </span>
-      </p>
       <div
-        class="euiText emotion-euiText-s-euiCard__description"
-        id="generated-idDescription"
+        class="euiCard__content emotion-euiCard__content-vertical"
       >
-        <p>
-          <span>
-            Experience what machine learning, advanced security, and all our other 
-            <a
-              class="euiLink emotion-euiLink-primary"
-              href="https://www.elastic.co/subscriptions"
-              rel="noopener"
-              target="_blank"
-            >
-              subscription features
-              <span
-                class="emotion-euiLink__externalIcon"
-                data-euiicon-type="popout"
-              >
-                External link
-              </span>
-              <span
-                class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
-              >
-                (opens in a new tab or window)
-              </span>
-            </a>
-             have to offer.
+        <p
+          class="euiTitle euiCard__title emotion-euiTitle-s"
+          id="generated-idTitle"
+        >
+          <span
+            class="emotion-euiCard__text-center"
+          >
+            Start a 30-day trial
           </span>
         </p>
+        <div
+          class="euiText emotion-euiText-s-euiCard__description"
+          id="generated-idDescription"
+        >
+          <p>
+            <span>
+              Experience what machine learning, advanced security, and all our other 
+              <a
+                class="euiLink emotion-euiLink-primary"
+                href="https://www.elastic.co/subscriptions"
+                rel="noopener"
+                target="_blank"
+              >
+                subscription features
+                <span
+                  class="emotion-euiLink__externalIcon"
+                  data-euiicon-type="popout"
+                >
+                  External link
+                </span>
+                <span
+                  class="emotion-euiScreenReaderOnly-euiLink__screenReaderText"
+                >
+                  (opens in a new tab or window)
+                </span>
+              </a>
+               have to offer.
+            </span>
+          </p>
+        </div>
       </div>
-    </div>
-    <div
-      class="emotion-euiCard__footer"
-    >
-      <button
-        class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
-        data-test-subj="startTrialButton"
-        type="button"
+      <div
+        class="emotion-euiCard__footer"
       >
-        <span
-          class="emotion-euiButtonDisplayContent"
+        <button
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
+          data-test-subj="startTrialButton"
+          type="button"
         >
-          Start trial
-        </span>
-      </button>
+          <span
+            class="emotion-euiButtonDisplayContent"
+          >
+            Start trial
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index b90121bbad63a..c3b0dc07f67ab 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -70,10 +70,10 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <a
             class="euiButtonEmpty css-9t7nyf-empty-primary"
@@ -93,10 +93,10 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
           </a>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="uploadLicenseButton"
             type="button"
           >
@@ -206,10 +206,10 @@ exports[`UploadLicense should display an error when ES says license is expired 1
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <a
             class="euiButtonEmpty css-9t7nyf-empty-primary"
@@ -229,10 +229,10 @@ exports[`UploadLicense should display an error when ES says license is expired 1
           </a>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="uploadLicenseButton"
             type="button"
           >
@@ -342,10 +342,10 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <a
             class="euiButtonEmpty css-9t7nyf-empty-primary"
@@ -365,10 +365,10 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
           </a>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="uploadLicenseButton"
             type="button"
           >
@@ -478,10 +478,10 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <a
             class="euiButtonEmpty css-9t7nyf-empty-primary"
@@ -501,10 +501,10 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
           </a>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="uploadLicenseButton"
             type="button"
           >
@@ -614,10 +614,10 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <a
             class="euiButtonEmpty css-9t7nyf-empty-primary"
@@ -637,10 +637,10 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
           </a>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="uploadLicenseButton"
             type="button"
           >
diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap b/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap
index 5ec28a8743670..e4cd3dc8122ab 100644
--- a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap
+++ b/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap
@@ -7,7 +7,6 @@ exports[`FlexItemSetting component renders a null label if label/tooltip text no
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={true}
     label={null}
@@ -27,7 +26,6 @@ exports[`FlexItemSetting component renders component and children as expected 1`
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap b/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
index 25bf9c67c8cc2..5fdb5afc181bf 100644
--- a/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
+++ b/x-pack/plugins/logstash/public/application/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
@@ -111,7 +111,6 @@ exports[`PipelineEditor component includes required error message for falsy pipe
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -403,7 +402,6 @@ exports[`PipelineEditor component invalidates form for invalid pipeline id input
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -695,7 +693,6 @@ exports[`PipelineEditor component invalidates form for pipeline id with spaces 1
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -958,7 +955,6 @@ exports[`PipelineEditor component matches snapshot for clone pipeline 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -1261,7 +1257,6 @@ exports[`PipelineEditor component matches snapshot for create pipeline 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -1524,7 +1519,6 @@ exports[`PipelineEditor component matches snapshot for edit pipeline 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
diff --git a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
index 47dadb1246b38..8a9329ff801e2 100644
--- a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
@@ -20,7 +20,6 @@ exports[`should render EMS UI when left source is BOUNDARIES_SOURCE.EMS 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       labelType="label"
@@ -73,7 +72,6 @@ exports[`should render elasticsearch UI when left source is BOUNDARIES_SOURCE.EL
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       labelType="label"
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap
index 7ef5e39ba96f0..79be012887af9 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`should render 3 tick slider when renderAs is HEX 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Resolution"
@@ -13,7 +12,6 @@ exports[`should render 3 tick slider when renderAs is HEX 1`] = `
   >
     <EuiRange
       compressed={true}
-      fullWidth={false}
       isLoading={false}
       levels={Array []}
       max={3}
@@ -53,7 +51,6 @@ exports[`should render 4 tick slider when renderAs is GRID 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Resolution"
@@ -61,7 +58,6 @@ exports[`should render 4 tick slider when renderAs is GRID 1`] = `
   >
     <EuiRange
       compressed={true}
-      fullWidth={false}
       isLoading={false}
       levels={Array []}
       max={4}
@@ -105,7 +101,6 @@ exports[`should render 4 tick slider when renderAs is HEATMAP 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Resolution"
@@ -113,7 +108,6 @@ exports[`should render 4 tick slider when renderAs is HEATMAP 1`] = `
   >
     <EuiRange
       compressed={true}
-      fullWidth={false}
       isLoading={false}
       levels={Array []}
       max={4}
@@ -157,7 +151,6 @@ exports[`should render 4 tick slider when renderAs is POINT 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Resolution"
@@ -165,7 +158,6 @@ exports[`should render 4 tick slider when renderAs is POINT 1`] = `
   >
     <EuiRange
       compressed={true}
-      fullWidth={false}
       isLoading={false}
       levels={Array []}
       max={4}
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
index c99d67ffd5a30..c63b55f362a99 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
@@ -44,7 +44,6 @@ exports[`should enable sort order select when sort field provided 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="columnCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label="Field"
@@ -60,7 +59,6 @@ exports[`should enable sort order select when sort field provided 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="columnCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label="Order"
@@ -150,7 +148,6 @@ exports[`should render update source editor 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="columnCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label="Field"
@@ -165,7 +162,6 @@ exports[`should render update source editor 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="columnCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label="Order"
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
index f8c5951e95e04..6942407131554 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
@@ -26,7 +26,6 @@ exports[`scaling form should disable clusters option when clustering is not supp
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -63,7 +62,6 @@ exports[`scaling form should disable clusters option when clustering is not supp
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -104,7 +102,6 @@ exports[`scaling form should render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -134,7 +131,6 @@ exports[`scaling form should render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_source_settings.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_source_settings.test.tsx.snap
index 7926011be4ecc..0a73383f7d1b7 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_source_settings.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_source_settings.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`should not render fields-editor when there is no layername 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Source layer"
@@ -62,7 +61,6 @@ exports[`should render with fields 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Source layer"
@@ -114,7 +112,6 @@ exports[`should render with fields 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
@@ -162,7 +159,6 @@ exports[`should render without fields 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Source layer"
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_vector_source_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_vector_source_editor.test.tsx.snap
index ccd0e0064d075..d1deee63a4e1b 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_vector_source_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_vector_source_editor.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`should render source creation editor (fields should _not_ be included)
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText="URL of the .mvt vector tile service. e.g. http://company.com/{z}/{x}/{y}.pbf"
diff --git a/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/__snapshots__/xyz_tms_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/__snapshots__/xyz_tms_editor.test.tsx.snap
index 6dfa7afabc71b..1ace2712d318e 100644
--- a/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/__snapshots__/xyz_tms_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/__snapshots__/xyz_tms_editor.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`should render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Url"
diff --git a/x-pack/plugins/maps/public/classes/styles/ems/components/__snapshots__/ems_vector_tile_style_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/ems/components/__snapshots__/ems_vector_tile_style_editor.test.tsx.snap
index 5827f0ad1436e..dc27dae12c7b6 100644
--- a/x-pack/plugins/maps/public/classes/styles/ems/components/__snapshots__/ems_vector_tile_style_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/ems/components/__snapshots__/ems_vector_tile_style_editor.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`EMSVectorTileStyleEditor is rendered 1`] = `
 <EuiFormRow
   describedByIds={Array []}
   display="columnCompressed"
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   label="Color blend"
diff --git a/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap
index f1ef56a2ef273..b549a3d7e57a9 100644
--- a/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
 <EuiFormRow
   describedByIds={Array []}
   display="rowCompressed"
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   label="Color range"
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
index 174dcb6f44ae1..5a3ac322de19b 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
@@ -394,7 +394,6 @@ exports[`should render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressedSwitch"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -748,7 +747,6 @@ exports[`should render with no style fields 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressedSwitch"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
index 7d712e7e9ab35..b21e9b36d89ff 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
@@ -29,7 +29,6 @@ exports[`should render a custom icon modal with an existing icon 1`] = `
           describedByIds={Array []}
           display="rowCompressed"
           error=""
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           helpText="SVGs without sharp corners and intricate details work best. Modifying the settings under Advanced options may improve rendering."
@@ -51,7 +50,6 @@ exports[`should render a custom icon modal with an existing icon 1`] = `
         <EuiFormRow
           describedByIds={Array []}
           display="rowCompressed"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label="Name"
@@ -94,7 +92,6 @@ exports[`should render a custom icon modal with an existing icon 1`] = `
               className="mapsCustomIconForm__cutoff"
               describedByIds={Array []}
               display="rowCompressed"
-              fullWidth={false}
               hasChildLabel={true}
               hasEmptyLabelSpace={false}
               label={
@@ -132,7 +129,6 @@ exports[`should render a custom icon modal with an existing icon 1`] = `
               className="mapsCustomIconForm__radius"
               describedByIds={Array []}
               display="rowCompressed"
-              fullWidth={false}
               hasChildLabel={true}
               hasEmptyLabelSpace={false}
               label={
@@ -255,7 +251,6 @@ exports[`should render an empty custom icon modal 1`] = `
           describedByIds={Array []}
           display="rowCompressed"
           error=""
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           helpText="SVGs without sharp corners and intricate details work best. Modifying the settings under Advanced options may improve rendering."
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap b/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
index fc10eceb45601..93c4f4e546013 100644
--- a/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
+++ b/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
@@ -6,7 +6,6 @@ exports[`should render 1`] = `
     describedByIds={Array []}
     display="row"
     error="Data view does not contain any geospatial fields"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={true}
@@ -73,7 +72,6 @@ exports[`should render no index pattern warning when there are no matching index
     describedByIds={Array []}
     display="row"
     error="Data view does not contain any geospatial fields"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={true}
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/validated_number_input.test.tsx.snap b/x-pack/plugins/maps/public/components/__snapshots__/validated_number_input.test.tsx.snap
index 75945c82a0118..96f13f1dfd574 100644
--- a/x-pack/plugins/maps/public/components/__snapshots__/validated_number_input.test.tsx.snap
+++ b/x-pack/plugins/maps/public/components/__snapshots__/validated_number_input.test.tsx.snap
@@ -9,7 +9,6 @@ exports[`should render with error 1`] = `
       "Must be between 0 and 20",
     ]
   }
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   isInvalid={true}
@@ -32,7 +31,6 @@ exports[`should render without error 1`] = `
   describedByIds={Array []}
   display="row"
   error={Array []}
-  fullWidth={false}
   hasChildLabel={true}
   hasEmptyLabelSpace={false}
   isInvalid={false}
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
index 1faf4f0c1105c..cee44b3e6b27c 100644
--- a/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
+++ b/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
@@ -4,7 +4,6 @@ exports[`Should display error message when value is outside of range 1`] = `
 <div>
   <EuiRange
     compressed={false}
-    fullWidth={false}
     isLoading={false}
     levels={Array []}
     max={10}
@@ -36,7 +35,6 @@ exports[`Should display error message when value is outside of range 1`] = `
 exports[`Should pass slider props to slider 1`] = `
 <EuiRange
   compressed={false}
-  fullWidth={false}
   isLoading={false}
   levels={Array []}
   max={10}
@@ -55,7 +53,6 @@ exports[`Should pass slider props to slider 1`] = `
 exports[`Should render slider 1`] = `
 <EuiRange
   compressed={false}
-  fullWidth={false}
   isLoading={false}
   levels={Array []}
   max={10}
diff --git a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/__snapshots__/geometry_filter_form.test.js.snap b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/__snapshots__/geometry_filter_form.test.js.snap
index 5142599b7dfb6..b67e8040cc6ac 100644
--- a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/__snapshots__/geometry_filter_form.test.js.snap
+++ b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/__snapshots__/geometry_filter_form.test.js.snap
@@ -5,7 +5,6 @@ exports[`render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="rowCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Geometry label"
@@ -20,7 +19,6 @@ exports[`render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="rowCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Spatial relation"
@@ -76,7 +74,6 @@ exports[`should render error message 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="rowCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Geometry label"
@@ -91,7 +88,6 @@ exports[`should render error message 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="rowCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Spatial relation"
diff --git a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/__snapshots__/layer_wizard_select.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/__snapshots__/layer_wizard_select.test.tsx.snap
index 9ec7256798496..25efd35cb2009 100644
--- a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/__snapshots__/layer_wizard_select.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/__snapshots__/layer_wizard_select.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`LayerWizardSelect Should render layer select after layer wizards are lo
     <EuiFacetButton
       isSelected={true}
       key="all"
+      minWidth={false}
       onClick={[Function]}
     >
       <FormattedMessage
@@ -20,6 +21,7 @@ exports[`LayerWizardSelect Should render layer select after layer wizards are lo
     <EuiFacetButton
       isSelected={false}
       key="ELASTICSEARCH"
+      minWidth={false}
       onClick={[Function]}
     >
       Elasticsearch
@@ -27,6 +29,7 @@ exports[`LayerWizardSelect Should render layer select after layer wizards are lo
     <EuiFacetButton
       isSelected={false}
       key="SOLUTIONS"
+      minWidth={false}
       onClick={[Function]}
     >
       Solutions
diff --git a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx
index 17cbf6239170c..d7e99bb115b9b 100644
--- a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx
+++ b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx
@@ -111,6 +111,7 @@ export class LayerWizardSelect extends Component<Props, State> {
           key={category}
           isSelected={category === this.state.selectedCategory}
           onClick={() => this._filterByCategory(category)}
+          minWidth={false}
         >
           {getCategoryLabel(category)}
         </EuiFacetButton>
@@ -123,6 +124,7 @@ export class LayerWizardSelect extends Component<Props, State> {
           key="all"
           isSelected={!this.state.selectedCategory}
           onClick={() => this._filterByCategory(null)}
+          minWidth={false}
         >
           <FormattedMessage id="xpack.maps.layerWizardSelect.allCategories" defaultMessage="All" />
         </EuiFacetButton>
diff --git a/x-pack/plugins/maps/public/connected_components/map_settings_panel/__snapshots__/navigation_panel.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/map_settings_panel/__snapshots__/navigation_panel.test.tsx.snap
index 1859c7d8177f8..a180466332cfc 100644
--- a/x-pack/plugins/maps/public/connected_components/map_settings_panel/__snapshots__/navigation_panel.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/map_settings_panel/__snapshots__/navigation_panel.test.tsx.snap
@@ -19,7 +19,6 @@ exports[`should render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -60,7 +59,6 @@ exports[`should render 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Initial map location"
@@ -113,7 +111,6 @@ exports[`should render browser location form when initialLocation is BROWSER_LOC
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -154,7 +151,6 @@ exports[`should render browser location form when initialLocation is BROWSER_LOC
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Initial map location"
@@ -188,7 +184,6 @@ exports[`should render browser location form when initialLocation is BROWSER_LOC
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Initial zoom"
@@ -227,7 +222,6 @@ exports[`should render fixed location form when initialLocation is FIXED_LOCATIO
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     labelType="label"
@@ -268,7 +262,6 @@ exports[`should render fixed location form when initialLocation is FIXED_LOCATIO
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Initial map location"
@@ -302,7 +295,6 @@ exports[`should render fixed location form when initialLocation is FIXED_LOCATIO
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Initial latitude"
@@ -317,7 +309,6 @@ exports[`should render fixed location form when initialLocation is FIXED_LOCATIO
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Initial longitude"
@@ -332,7 +323,6 @@ exports[`should render fixed location form when initialLocation is FIXED_LOCATIO
   <EuiFormRow
     describedByIds={Array []}
     display="columnCompressed"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label="Initial zoom"
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/footer.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/footer.test.tsx.snap
index 6840456741e03..b4b1a319bab45 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/footer.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/footer.test.tsx.snap
@@ -26,7 +26,6 @@ exports[`Footer multiple features, multiple layers: locked should show paginatio
       <EuiFormRow
         describedByIds={Array []}
         display="rowCompressed"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         labelType="label"
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/job_map.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/job_map.tsx
index 8a1f1cdc9501b..f7bd29129f2a1 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/job_map.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/job_map.tsx
@@ -34,7 +34,7 @@ linear-gradient(
 center,
 ${theme.euiColorLightShade}`,
   backgroundSize: `${theme.euiSizeL} ${theme.euiSizeL}`,
-  margin: `-${theme.gutterTypes.gutterLarge}`,
+  margin: `-${theme.euiSizeL}`,
   marginTop: 0,
 });
 
@@ -171,10 +171,7 @@ export const JobMap: FC<Props> = ({ analyticsId, modelId, forceRefresh }) => {
           </EuiButtonEmpty>
         </EuiFlexItem>
       </EuiFlexGroup>
-      <div
-        style={{ height: height - parseInt(euiTheme.gutterTypes.gutterLarge, 10) - 20 }}
-        ref={ref}
-      >
+      <div style={{ height: height - parseInt(euiTheme.euiSizeL, 10) - 20 }} ref={ref}>
         <Cytoscape
           theme={euiTheme}
           height={height - 20}
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
index 48522d6853f9e..129ac8b42f02b 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
@@ -99,8 +99,8 @@ describe('ExplorerChartsContainer', () => {
       </I18nProvider>
     );
 
-    expect(wrapper.html()).toBe(
-      '<div class="euiFlexGrid euiFlexGrid--gutterMedium euiFlexGrid--wrap euiFlexGrid--responsive" data-test-subj="mlExplorerChartsContainer"></div>'
+    expect(wrapper.html()).toEqual(
+      '<div class="euiFlexGrid css-17f5jta-euiFlexGrid-m-row-stretch-responsive" data-test-subj="mlExplorerChartsContainer"></div>'
     );
   });
 
@@ -126,7 +126,7 @@ describe('ExplorerChartsContainer', () => {
 
     // We test child components with snapshots separately
     // so we just do a high level check here.
-    expect(wrapper.find('.ml-explorer-chart-container').children()).toHaveLength(2);
+    expect(wrapper.find('div.ml-explorer-chart-container').children()).toHaveLength(1);
 
     // Check if the additional y-axis information for rare charts is not part of the chart
     expect(wrapper.html().search(rareChartUniqueString)).toBe(-1);
@@ -153,7 +153,7 @@ describe('ExplorerChartsContainer', () => {
 
     // We test child components with snapshots separately
     // so we just do a high level check here.
-    expect(wrapper.find('.ml-explorer-chart-container').children()).toHaveLength(2);
+    expect(wrapper.find('div.ml-explorer-chart-container').children()).toHaveLength(1);
 
     // Check if the additional y-axis information for rare charts is part of the chart
     expect(wrapper.html().search(rareChartUniqueString)).toBeGreaterThan(0);
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap
index 6533405a0770f..6c5d3d473d413 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap
@@ -25,7 +25,6 @@ exports[`CustomUrlEditor renders the editor for a dashboard type URL with a labe
       describedByIds={Array []}
       display="rowCompressed"
       error={Array []}
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={false}
@@ -50,7 +49,6 @@ exports[`CustomUrlEditor renders the editor for a dashboard type URL with a labe
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -88,7 +86,6 @@ exports[`CustomUrlEditor renders the editor for a dashboard type URL with a labe
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -122,7 +119,6 @@ exports[`CustomUrlEditor renders the editor for a dashboard type URL with a labe
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -165,7 +161,6 @@ exports[`CustomUrlEditor renders the editor for a dashboard type URL with a labe
           className="url-time-range"
           describedByIds={Array []}
           display="rowCompressed"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label={
@@ -227,7 +222,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti
       describedByIds={Array []}
       display="rowCompressed"
       error={Array []}
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={false}
@@ -252,7 +246,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -290,7 +283,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -324,7 +316,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -373,7 +364,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti
           className="url-time-range"
           describedByIds={Array []}
           display="rowCompressed"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label={
@@ -415,7 +405,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti
               "Invalid interval format",
             ]
           }
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           isInvalid={true}
@@ -467,7 +456,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t
       describedByIds={Array []}
       display="rowCompressed"
       error={Array []}
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={false}
@@ -492,7 +480,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -530,7 +517,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -564,7 +550,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -613,7 +598,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t
           className="url-time-range"
           describedByIds={Array []}
           display="rowCompressed"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label={
@@ -651,7 +635,6 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t
           describedByIds={Array []}
           display="rowCompressed"
           error={Array []}
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           isInvalid={false}
@@ -707,7 +690,6 @@ exports[`CustomUrlEditor renders the editor for a new dashboard type URL with no
           "A unique label must be supplied",
         ]
       }
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={true}
@@ -732,7 +714,6 @@ exports[`CustomUrlEditor renders the editor for a new dashboard type URL with no
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -770,7 +751,6 @@ exports[`CustomUrlEditor renders the editor for a new dashboard type URL with no
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -804,7 +784,6 @@ exports[`CustomUrlEditor renders the editor for a new dashboard type URL with no
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -847,7 +826,6 @@ exports[`CustomUrlEditor renders the editor for a new dashboard type URL with no
           className="url-time-range"
           describedByIds={Array []}
           display="rowCompressed"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           label={
@@ -913,7 +891,6 @@ exports[`CustomUrlEditor renders the editor for other type of URL with duplicate
           "A unique label must be supplied",
         ]
       }
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={true}
@@ -938,7 +915,6 @@ exports[`CustomUrlEditor renders the editor for other type of URL with duplicate
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
@@ -1026,7 +1002,6 @@ exports[`CustomUrlEditor renders the editor for other type of URL with unique la
       describedByIds={Array []}
       display="rowCompressed"
       error={Array []}
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={false}
@@ -1051,7 +1026,6 @@ exports[`CustomUrlEditor renders the editor for other type of URL with unique la
     <EuiFormRow
       describedByIds={Array []}
       display="rowCompressed"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       label={
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/list.test.tsx.snap b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/list.test.tsx.snap
index aec10f2a3c3ea..365f318d8ae22 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/list.test.tsx.snap
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/list.test.tsx.snap
@@ -16,7 +16,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
         describedByIds={Array []}
         display="row"
         error={Array []}
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -69,7 +68,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
         describedByIds={Array []}
         display="row"
         error={Array []}
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -96,7 +94,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={true}
         labelType="label"
@@ -130,7 +127,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={true}
         labelType="label"
@@ -171,7 +167,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
         describedByIds={Array []}
         display="row"
         error={Array []}
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -224,7 +219,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
         describedByIds={Array []}
         display="row"
         error={Array []}
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -251,7 +245,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={true}
         labelType="label"
@@ -285,7 +278,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={true}
         labelType="label"
@@ -326,7 +318,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
         describedByIds={Array []}
         display="row"
         error={Array []}
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -379,7 +370,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
         describedByIds={Array []}
         display="row"
         error={Array []}
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -406,7 +396,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={true}
         labelType="label"
@@ -440,7 +429,6 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={true}
         labelType="label"
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/multi_job_actions/group_selector/group_list/group_list.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/multi_job_actions/group_selector/group_list/group_list.js
index 8d4830feb95b3..0fdfbcb058e37 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/multi_job_actions/group_selector/group_list/group_list.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/multi_job_actions/group_selector/group_list/group_list.js
@@ -88,7 +88,7 @@ export class GroupList extends Component {
     const { selectedGroups, groups } = this.props;
 
     return (
-      <div className="group-list">
+      <EuiFlexGroup direction="column" gutterSize="m" className="group-list">
         {groups.map((g, index) => (
           <div
             tabIndex={'0'}
@@ -108,7 +108,7 @@ export class GroupList extends Component {
             </EuiFlexGroup>
           </div>
         ))}
-      </div>
+      </EuiFlexGroup>
     );
   }
 }
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap b/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
index 4f90af5ab5957..31a167b2d745e 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
@@ -21,7 +21,6 @@ exports[`CalendarForm Renders calendar form 1`] = `
         "Use lowercase alphanumerics (a-z and 0-9), hyphens or underscores; must start and end with an alphanumeric character",
       ]
     }
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={true}
@@ -45,7 +44,6 @@ exports[`CalendarForm Renders calendar form 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
@@ -87,7 +85,6 @@ exports[`CalendarForm Renders calendar form 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
@@ -116,7 +113,6 @@ exports[`CalendarForm Renders calendar form 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     label={
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap b/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
index 1045165160a85..ef0b837889833 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
@@ -35,7 +35,6 @@ exports[`AddItemPopover calls addItems with multiple items on clicking Add butto
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="filter_list_add_item_input_row"
@@ -127,7 +126,6 @@ exports[`AddItemPopover opens the popover onButtonClick 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="filter_list_add_item_input_row"
@@ -219,7 +217,6 @@ exports[`AddItemPopover renders the popover 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         id="filter_list_add_item_input_row"
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap b/x-pack/plugins/ml/public/application/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap
index ba7492ad3bf60..b8b6e92d1ce8e 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap
@@ -35,7 +35,6 @@ exports[`FilterListUsagePopover opens the popover onButtonClick 1`] = `
         <EuiFormRow
           describedByIds={Array []}
           display="row"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           id="filter_list_edit_description_row"
@@ -96,7 +95,6 @@ exports[`FilterListUsagePopover renders the popover with a description 1`] = `
         <EuiFormRow
           describedByIds={Array []}
           display="row"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           id="filter_list_edit_description_row"
@@ -157,7 +155,6 @@ exports[`FilterListUsagePopover renders the popover with no description 1`] = `
         <EuiFormRow
           describedByIds={Array []}
           display="row"
-          fullWidth={false}
           hasChildLabel={true}
           hasEmptyLabelSpace={false}
           id="filter_list_edit_description_row"
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/header.test.js.snap b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/header.test.js.snap
index 41be7bfd0f652..46898855efcda 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/header.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/header.test.js.snap
@@ -49,7 +49,6 @@ exports[`EditFilterListHeader renders the header when creating a new filter list
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText="Use lowercase alphanumerics (a-z and 0-9), hyphens or underscores; must start and end with an alphanumeric character"
@@ -157,7 +156,6 @@ exports[`EditFilterListHeader renders the header when creating a new filter list
         "Use lowercase alphanumerics (a-z and 0-9), hyphens or underscores; must start and end with an alphanumeric character",
       ]
     }
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={true}
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap
index 20f99fbe874ed..7dca3633b2f89 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap
@@ -10,20 +10,20 @@ exports[`Node Listing Metric Cell should format N/A as the metric for an offline
 
 exports[`Node Listing Metric Cell should format a non-percentage metric 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   />
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-stretch-row"
       data-test-subj="testCell2"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -49,7 +49,7 @@ exports[`Node Listing Metric Cell should format a non-percentage metric 1`] = `
         </div>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiText emotion-euiText-m"
@@ -64,20 +64,20 @@ exports[`Node Listing Metric Cell should format a non-percentage metric 1`] = `
 
 exports[`Node Listing Metric Cell should format a percentage metric 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   />
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-xs-flexStart-stretch-row"
       data-test-subj="testCell"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiPopover emotion-euiPopover"
@@ -103,7 +103,7 @@ exports[`Node Listing Metric Cell should format a percentage metric 1`] = `
         </div>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiText emotion-euiText-m"
diff --git a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
index 1f8a9c0ecc42d..030543ec8f713 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
@@ -46,13 +46,13 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
         class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-s-spaceAround-center-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="enableCollectionInterval"
             type="button"
           >
@@ -137,13 +137,13 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
         class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-s-spaceAround-center-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="enableCollectionInterval"
             type="button"
           >
diff --git a/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__snapshots__/collection_enabled.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__snapshots__/collection_enabled.test.js.snap
index ec8a775454ba0..e7ddacc878111 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__snapshots__/collection_enabled.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__snapshots__/collection_enabled.test.js.snap
@@ -43,13 +43,13 @@ Array [
     class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
   />,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-spaceAround-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
         data-test-subj="enableCollectionEnabled"
         type="button"
       >
diff --git a/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__snapshots__/collection_interval.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__snapshots__/collection_interval.test.js.snap
index 9e2e4dcb272fc..603ee77f03fce 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__snapshots__/collection_interval.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__snapshots__/collection_interval.test.js.snap
@@ -74,13 +74,13 @@ Array [
     class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
   />,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-spaceAround-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <button
-        class="euiButton emotion-euiButtonDisplay-m-isDisabled-m-fill-disabled"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-isDisabled-m-fill-disabled"
         data-test-subj="enableCollectionInterval"
         disabled=""
         type="button"
@@ -148,13 +148,13 @@ Array [
     class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
   />,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-spaceAround-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
         data-test-subj="enableCollectionInterval"
         type="button"
       >
diff --git a/x-pack/plugins/monitoring/public/components/no_data/reasons/__snapshots__/reason_found.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/reasons/__snapshots__/reason_found.test.js.snap
index 928444f5c073e..76dc6356116ae 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/reasons/__snapshots__/reason_found.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/reasons/__snapshots__/reason_found.test.js.snap
@@ -46,13 +46,13 @@ Array [
     class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
   />,
   <div
-    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-s-spaceAround-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <button
-        class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+        class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
         data-test-subj="enableCollectionInterval"
         type="button"
       >
diff --git a/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap b/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap
index b393327b72b76..031c2427b7da8 100644
--- a/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/page_loading/__snapshots__/page_loading.test.js.snap
@@ -13,16 +13,16 @@ exports[`PageLoading should show a simple page loading component 1`] = `
       role="main"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceAround-stretch-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <span
                 aria-label="Loading"
@@ -31,7 +31,7 @@ exports[`PageLoading should show a simple page loading component 1`] = `
               />
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               Loading…
             </div>
diff --git a/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap b/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
index 17f2e0cfd68ce..ecbbb793c4970 100644
--- a/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
@@ -6,10 +6,10 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
   intl="[object Object]"
 >
   <div
-    class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-m-spaceBetween-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
+      class="euiFlexItem eui-textTruncate emotion-euiFlexItem-growZero"
       style="max-width:200px"
     >
       <div
@@ -41,7 +41,7 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       data-test-subj="transportAddress"
       style="max-width:200px"
     >
@@ -69,7 +69,7 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       data-test-subj="documentCount"
       style="max-width:200px"
     >
@@ -108,14 +108,14 @@ exports[`Summary Status Component should allow status to be optional 1`] = `
   intl="[object Object]"
 >
   <div
-    class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-m-spaceBetween-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
+      class="euiFlexItem eui-textTruncate emotion-euiFlexItem-growZero"
       style="max-width:200px"
     />
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       data-test-subj="freeDiskSpace"
       style="max-width:200px"
     >
@@ -145,7 +145,7 @@ exports[`Summary Status Component should allow status to be optional 1`] = `
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       data-test-subj="documentCount"
       style="max-width:200px"
     >
@@ -184,10 +184,10 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
   intl="[object Object]"
 >
   <div
-    class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-m-spaceBetween-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero eui-textTruncate"
+      class="euiFlexItem eui-textTruncate emotion-euiFlexItem-growZero"
       style="max-width:200px"
     >
       <div
@@ -219,7 +219,7 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       data-test-subj="freeDiskSpace"
       style="max-width:200px"
     >
@@ -249,7 +249,7 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
       data-test-subj="documentCount"
       style="max-width:200px"
     >
diff --git a/x-pack/plugins/osquery/cypress/e2e/all/edit_saved_queries.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/edit_saved_queries.cy.ts
index 42ffd48d73692..7551176853f5e 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/edit_saved_queries.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/edit_saved_queries.cy.ts
@@ -32,7 +32,7 @@ describe('ALL - Edit saved query', () => {
     }).click();
     cy.contains('Custom key/value pairs.').should('exist');
     cy.contains('Hours of uptime').should('exist');
-    cy.react('ECSMappingEditorForm').within(() => {
+    cy.get('[data-test-subj="ECSMappingEditorForm"]').within(() => {
       cy.react('EuiButtonIcon', { props: { iconType: 'trash' } }).click();
     });
 
diff --git a/x-pack/plugins/osquery/cypress/e2e/roles/t2_analyst.cy.ts b/x-pack/plugins/osquery/cypress/e2e/roles/t2_analyst.cy.ts
index 423977675ed0d..6f2ba0a26882f 100644
--- a/x-pack/plugins/osquery/cypress/e2e/roles/t2_analyst.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/roles/t2_analyst.cy.ts
@@ -109,7 +109,7 @@ describe('T2 Analyst - READ + Write Live/Saved + runSavedQueries ', () => {
     }).click();
     cy.contains('Custom key/value pairs.').should('exist');
     cy.contains('Hours of uptime').should('exist');
-    cy.react('ECSMappingEditorForm').within(() => {
+    cy.get('[data-test-subj="ECSMappingEditorForm"]').within(() => {
       cy.react('EuiButtonIcon', { props: { iconType: 'trash' } }).click();
     });
     cy.react('EuiButton').contains('Update query').click();
diff --git a/x-pack/plugins/osquery/public/live_queries/form/query_pack_selectable.tsx b/x-pack/plugins/osquery/public/live_queries/form/query_pack_selectable.tsx
index e96d5369c7648..cc32a8c15cd43 100644
--- a/x-pack/plugins/osquery/public/live_queries/form/query_pack_selectable.tsx
+++ b/x-pack/plugins/osquery/public/live_queries/form/query_pack_selectable.tsx
@@ -11,21 +11,6 @@ import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 
 const StyledEuiCard = styled(EuiCard)`
-  /*
-  TODO: this css shouldn't be necessary after https://github.com/elastic/eui/issues/6345
-  tested this placeholder fix on mac in Chrome, Firefox, Safari, and Edge
-  with multiple zoom levels and with keyboard <tab> navigation
-  and in a responsive design / mobile view
-  */
-  padding-bottom: 60px;
-  position: relative;
-
-  button {
-    position: absolute;
-    bottom: 0;
-  }
-  /* end todo css */
-
   padding: 16px 92px 16px 16px !important;
 
   .euiTitle {
diff --git a/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap b/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
index 0e296c8ae0610..311255275fea3 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
@@ -25,7 +25,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "canvas" layout
       class="euiFormRow__fieldWrapper"
     >
       <div
-        class="euiSwitch"
+        class="euiSwitch emotion-euiSwitch"
       >
         <button
           aria-checked="false"
@@ -77,7 +77,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "canvas" layout
     </div>
   </div>
   <button
-    class="euiButton emotion-euiButtonDisplay-s-fullWidth-s-fill-primary"
+    class="euiButton emotion-euiButtonDisplay-s-fullWidth-defaultMinWidth-s-fill-primary"
     data-test-subj="generateReportButton"
     type="button"
   >
@@ -217,7 +217,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "print" layout o
       class="euiFormRow__fieldWrapper"
     >
       <div
-        class="euiSwitch"
+        class="euiSwitch emotion-euiSwitch"
       >
         <button
           aria-checked="false"
@@ -269,7 +269,7 @@ exports[`ScreenCapturePanelContent properly renders a view with "print" layout o
     </div>
   </div>
   <button
-    class="euiButton emotion-euiButtonDisplay-s-fullWidth-s-fill-primary"
+    class="euiButton emotion-euiButtonDisplay-s-fullWidth-defaultMinWidth-s-fill-primary"
     data-test-subj="generateReportButton"
     type="button"
   >
@@ -402,7 +402,7 @@ exports[`ScreenCapturePanelContent renders the default view properly 1`] = `
     class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
   />
   <button
-    class="euiButton emotion-euiButtonDisplay-s-fullWidth-s-fill-primary"
+    class="euiButton emotion-euiButtonDisplay-s-fullWidth-defaultMinWidth-s-fill-primary"
     data-test-subj="generateReportButton"
     type="button"
   >
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap b/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
index f779e5748a34a..bf6e877763cc8 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
@@ -59,7 +59,6 @@ exports[`LoginForm renders as expected 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -88,7 +87,6 @@ exports[`LoginForm renders as expected 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         isInvalid={false}
@@ -107,7 +105,6 @@ exports[`LoginForm renders as expected 1`] = `
           compressed={false}
           data-test-subj="loginPassword"
           disabled={false}
-          fullWidth={false}
           id="password"
           isInvalid={false}
           isLoading={false}
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap b/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
index cb9dfea9f9b49..fe9eaf55c15e8 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
@@ -34,7 +34,7 @@ exports[`OverwrittenSessionPage renders as expected 1`] = `
     class="secAuthenticationStatePage__content eui-textCenter"
   >
     <a
-      class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+      class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
       href="/mock-base-path/"
       rel="noreferrer"
     >
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
index 6f526d0715ac2..5c4097aacd325 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
@@ -103,7 +103,6 @@ exports[`it renders without crashing 1`] = `
     <EuiFormRow
       describedByIds={Array []}
       display="row"
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={true}
       labelType="label"
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
index 4dd032f15e8d8..90ee476659584 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
@@ -137,7 +137,6 @@ exports[`it renders without crashing 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={true}
         labelType="label"
diff --git a/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap b/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
index e8739e2d957d7..8a5add971f7f5 100644
--- a/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PromptPage renders as expected with additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/some/script1.js\\"></script><script src=\\"/mock-basepath/some/script2.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">Some Title</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><div>Some Body</div></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive euiEmptyPrompt__actions\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></div></div></div></body></html>"`;
+exports[`PromptPage renders as expected with additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/some/script1.js\\"></script><script src=\\"/mock-basepath/some/script2.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">Some Title</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><div>Some Body</div></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiEmptyPrompt__actions eui-17kdkag-euiFlexGroup-m-center-center-column\\"><div class=\\"euiFlexItem eui-kpsrin-euiFlexItem-growZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem eui-kpsrin-euiFlexItem-growZero\\"><span>Action#2</span></div></div></div></div></div></div></div></div></div></body></html>"`;
 
-exports[`PromptPage renders as expected without additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">Some Title</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><div>Some Body</div></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive euiEmptyPrompt__actions\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></div></div></div></body></html>"`;
+exports[`PromptPage renders as expected without additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">Some Title</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><div>Some Body</div></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiEmptyPrompt__actions eui-17kdkag-euiFlexGroup-m-center-center-column\\"><div class=\\"euiFlexItem eui-kpsrin-euiFlexItem-growZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem eui-kpsrin-euiFlexItem-growZero\\"><span>Action#2</span></div></div></div></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap b/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
index d891eeab2927c..7895382d4f654 100644
--- a/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UnauthenticatedPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">We couldn&#x27;t log you in</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><p>We hit an authentication error. Please check your credentials and try again. If you still can&#x27;t log in, contact your system administrator.</p></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive euiEmptyPrompt__actions\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a href=\\"/some/url?some-query=some-value#some-hash\\" rel=\\"noreferrer\\" class=\\"euiButton eui-1kkbqc8-euiButtonDisplay-m-m-fill-primary\\" data-test-subj=\\"logInButton\\"><span class=\\"eui-1km4ln8-euiButtonDisplayContent\\">Log in</span></a></div></div></div></div></div></div></div></div></div></body></html>"`;
+exports[`UnauthenticatedPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">We couldn&#x27;t log you in</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><p>We hit an authentication error. Please check your credentials and try again. If you still can&#x27;t log in, contact your system administrator.</p></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiEmptyPrompt__actions eui-17kdkag-euiFlexGroup-m-center-center-column\\"><div class=\\"euiFlexItem eui-kpsrin-euiFlexItem-growZero\\"><a href=\\"/some/url?some-query=some-value#some-hash\\" rel=\\"noreferrer\\" class=\\"euiButton eui-kyr7t-euiButtonDisplay-m-defaultMinWidth-m-fill-primary\\" data-test-subj=\\"logInButton\\"><span class=\\"eui-1km4ln8-euiButtonDisplayContent\\">Log in</span></a></div></div></div></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
index 7ac997d05dd09..a19757b3f52b2 100644
--- a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/internal/security/reset_session_page.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">You do not have permission to access the requested page</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><p>Either go back to the previous page or log in as a different user.</p></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive euiEmptyPrompt__actions\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a href=\\"/path/to/logout\\" rel=\\"noreferrer\\" class=\\"euiButton eui-1kkbqc8-euiButtonDisplay-m-m-fill-primary\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"eui-1km4ln8-euiButtonDisplayContent\\">Log in as different user</span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty eui-9t7nyf-empty-primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></div></div></div></div></div></body></html>"`;
+exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><style></style><style data-emotion=\\"eui \\"></style></style><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/internal/security/reset_session_page.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage eui-1po165g-euiPage-row-grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody eui-30ejv0-euiPageBody\\"><div class=\\"euiPanel euiPanel--plain euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-15y4d5v-euiPanel-grow-m-l-plain-hasShadow\\" role=\\"main\\"><div class=\\"euiPanel euiPanel--transparent euiEmptyPrompt euiEmptyPrompt--vertical euiEmptyPrompt--paddingLarge eui-7iihzj-euiPanel-m-transparent\\"><div class=\\"euiEmptyPrompt__main\\"><div class=\\"euiEmptyPrompt__icon\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiEmptyPrompt__content\\"><div class=\\"euiEmptyPrompt__contentInner\\"><h2 class=\\"euiTitle eui-smz32e-euiTitle-m\\">You do not have permission to access the requested page</h2><div class=\\"euiSpacer euiSpacer--m eui-jv9za2-euiSpacer-m\\"></div><div class=\\"euiText eui-1fpprkz-euiText-m-euiTextColor-subdued\\"><p>Either go back to the previous page or log in as a different user.</p></div><div class=\\"euiSpacer euiSpacer--l eui-p2o3x6-euiSpacer-l\\"></div><div class=\\"euiFlexGroup euiEmptyPrompt__actions eui-17kdkag-euiFlexGroup-m-center-center-column\\"><div class=\\"euiFlexItem eui-kpsrin-euiFlexItem-growZero\\"><a href=\\"/path/to/logout\\" rel=\\"noreferrer\\" class=\\"euiButton eui-kyr7t-euiButtonDisplay-m-defaultMinWidth-m-fill-primary\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"eui-1km4ln8-euiButtonDisplayContent\\">Log in as different user</span></a></div><div class=\\"euiFlexItem eui-kpsrin-euiFlexItem-growZero\\"><button class=\\"euiButtonEmpty eui-9t7nyf-empty-primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts
index d2162daed9250..31af8147b1940 100644
--- a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts
+++ b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts
@@ -78,10 +78,10 @@ describe('Alert details with unmapped fields', () => {
 
         // Due to the introduction of pagination on the table, a slight horizontal overflow has been introduced.
         // scroll ignores the `overflow-x:hidden` attribute and will still scroll the element if there is a hidden overflow
-        // Updated the below to equal 4 to account for this and keep a test to make sure it doesn't grow
+        // Updated the below to < 5 to account for this and keep a test to make sure it doesn't grow
         $tableContainer[0].scroll({ left: 1000 });
 
-        expect($tableContainer[0].scrollLeft).to.equal(4);
+        expect($tableContainer[0].scrollLeft).to.be.lessThan(5);
       });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap
index 4ebc902bb226f..08ca630fc3d67 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_host_table.test.tsx.snap
@@ -65,30 +65,30 @@ exports[`Authentication Host Table Component rendering it renders the host authe
     data-test-subj="header-section"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionColumn"
+      class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-stretch-column"
       data-test-subj="headerSectionOuterFlexGroup"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
           data-test-subj="headerSectionInnerFlexGroup"
         >
           <div
-            class="euiFlexItem"
+            class="euiFlexItem emotion-euiFlexItem-grow-1"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
             >
               <div
-                class="euiFlexItem"
+                class="euiFlexItem emotion-euiFlexItem-grow-1"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--directionRow header-section-titles"
+                  class="euiFlexGroup header-section-titles emotion-euiFlexGroup-none-flexStart-stretch-row"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <button
                       aria-label="Open"
@@ -106,7 +106,7 @@ exports[`Authentication Host Table Component rendering it renders the host authe
                     </button>
                   </div>
                   <div
-                    class="euiFlexItem"
+                    class="euiFlexItem emotion-euiFlexItem-grow-1"
                   >
                     <h4
                       class="euiTitle emotion-euiTitle-m"
@@ -122,7 +122,7 @@ exports[`Authentication Host Table Component rendering it renders the host authe
                 </div>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <button
                   aria-label="Inspect"
@@ -145,7 +145,7 @@ exports[`Authentication Host Table Component rendering it renders the host authe
         </div>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
           class="c2 siemSubtitle"
@@ -169,13 +169,13 @@ exports[`Authentication Host Table Component rendering it renders the host authe
         class="euiTableHeaderMobile"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup emotion-euiFlexGroup-l-spaceBetween-baseline-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           />
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           />
         </div>
       </div>
@@ -370,10 +370,10 @@ exports[`Authentication Host Table Component rendering it renders the host authe
     </div>
   </div>
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow c4"
+    class="euiFlexGroup c4 emotion-euiFlexGroup-l-flexStart-center-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -406,7 +406,7 @@ exports[`Authentication Host Table Component rendering it renders the host authe
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <nav
         class="euiPagination emotion-euiPagination-EuiPagination"
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap
index 533d45b3ff180..38a6936e156ca 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/__snapshots__/authentications_user_table.test.tsx.snap
@@ -65,30 +65,30 @@ exports[`Authentication User Table Component rendering it renders the user authe
     data-test-subj="header-section"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionColumn"
+      class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-stretch-column"
       data-test-subj="headerSectionOuterFlexGroup"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-center-row"
           data-test-subj="headerSectionInnerFlexGroup"
         >
           <div
-            class="euiFlexItem"
+            class="euiFlexItem emotion-euiFlexItem-grow-1"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
             >
               <div
-                class="euiFlexItem"
+                class="euiFlexItem emotion-euiFlexItem-grow-1"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--directionRow header-section-titles"
+                  class="euiFlexGroup header-section-titles emotion-euiFlexGroup-none-flexStart-stretch-row"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <button
                       aria-label="Open"
@@ -106,7 +106,7 @@ exports[`Authentication User Table Component rendering it renders the user authe
                     </button>
                   </div>
                   <div
-                    class="euiFlexItem"
+                    class="euiFlexItem emotion-euiFlexItem-grow-1"
                   >
                     <h4
                       class="euiTitle emotion-euiTitle-m"
@@ -122,7 +122,7 @@ exports[`Authentication User Table Component rendering it renders the user authe
                 </div>
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <button
                   aria-label="Inspect"
@@ -145,7 +145,7 @@ exports[`Authentication User Table Component rendering it renders the user authe
         </div>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
           class="c2 siemSubtitle"
@@ -169,13 +169,13 @@ exports[`Authentication User Table Component rendering it renders the user authe
         class="euiTableHeaderMobile"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+          class="euiFlexGroup emotion-euiFlexGroup-l-spaceBetween-baseline-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           />
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           />
         </div>
       </div>
@@ -370,10 +370,10 @@ exports[`Authentication User Table Component rendering it renders the user authe
     </div>
   </div>
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow c4"
+    class="euiFlexGroup c4 emotion-euiFlexGroup-l-flexStart-center-row"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
         class="euiPopover emotion-euiPopover"
@@ -406,7 +406,7 @@ exports[`Authentication User Table Component rendering it renders the user authe
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <nav
         class="euiPagination emotion-euiPagination-EuiPagination"
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx
index 622d3035a7de6..bd3c150272b3e 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.tsx
@@ -8,7 +8,6 @@
 import type { EuiTabbedContentTab } from '@elastic/eui';
 import {
   EuiFlexGroup,
-  EuiFlexItem,
   EuiHorizontalRule,
   EuiLoadingContent,
   EuiLoadingSpinner,
@@ -337,26 +336,17 @@ const EventDetailsComponent: React.FC<Props> = ({
         ? {
             id: EventsViewType.threatIntelView,
             'data-test-subj': 'threatIntelTab',
-            name: (
-              <EuiFlexGroup
-                direction="row"
-                alignItems={'center'}
-                justifyContent={'spaceAround'}
-                gutterSize="xs"
-              >
-                <EuiFlexItem>
-                  <span>{i18n.THREAT_INTEL}</span>
-                </EuiFlexItem>
-                <EuiFlexItem>
-                  {isEnrichmentsLoading ? (
-                    <EuiLoadingSpinner />
-                  ) : (
-                    <EuiNotificationBadge data-test-subj="enrichment-count-notification">
-                      {enrichmentCount}
-                    </EuiNotificationBadge>
-                  )}
-                </EuiFlexItem>
-              </EuiFlexGroup>
+            name: i18n.THREAT_INTEL,
+            append: (
+              <>
+                {isEnrichmentsLoading ? (
+                  <EuiLoadingSpinner />
+                ) : (
+                  <EuiNotificationBadge data-test-subj="enrichment-count-notification">
+                    {enrichmentCount}
+                  </EuiNotificationBadge>
+                )}
+              </>
             ),
             content: (
               <ThreatDetailsView
@@ -455,14 +445,17 @@ const EventDetailsComponent: React.FC<Props> = ({
       step={AlertsCasesTourSteps.reviewAlertDetailsFlyout}
       tourId={SecurityStepId.alertsCases}
     >
-      <StyledEuiTabbedContent
-        {...tourAnchor}
-        data-test-subj="eventDetails"
-        tabs={tabs}
-        selectedTab={selectedTab}
-        onTabClick={handleTabClick}
-        key="event-summary-tabs"
-      />
+      <>
+        <EuiSpacer size="s" />
+        <StyledEuiTabbedContent
+          {...tourAnchor}
+          data-test-subj="eventDetails"
+          tabs={tabs}
+          selectedTab={selectedTab}
+          onTabClick={handleTabClick}
+          key="event-summary-tabs"
+        />
+      </>
     </GuidedOnboardingTourStep>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/event_details/overview/__snapshots__/index.test.tsx.snap
index 4f8ea15fe9f07..967c38e39907f 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/__snapshots__/index.test.tsx.snap
@@ -83,10 +83,10 @@ exports[`Event Details Overview Cards renders rows and spacers correctly 1`] = `
 
 <div>
     <div
-      class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive c0"
+      class="euiFlexGroup c0 emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
           class="euiPanel euiPanel--plain euiPanel--paddingSmall c1 emotion-euiPanel-grow-none-s-plain"
@@ -100,7 +100,7 @@ exports[`Event Details Overview Cards renders rows and spacers correctly 1`] = `
             class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
           >
             <div
               class="c2"
@@ -183,7 +183,7 @@ exports[`Event Details Overview Cards renders rows and spacers correctly 1`] = `
         </div>
       </div>
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
           class="euiPanel euiPanel--plain euiPanel--paddingSmall c1 emotion-euiPanel-grow-none-s-plain"
@@ -197,7 +197,7 @@ exports[`Event Details Overview Cards renders rows and spacers correctly 1`] = `
             class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
           >
             <div
               class="c2"
@@ -256,10 +256,10 @@ exports[`Event Details Overview Cards renders rows and spacers correctly 1`] = `
       class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
     />
     <div
-      class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive c0"
+      class="euiFlexGroup c0 emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <div
           class="euiPanel euiPanel--plain euiPanel--paddingSmall c1 emotion-euiPanel-grow-none-s-plain"
@@ -273,7 +273,7 @@ exports[`Event Details Overview Cards renders rows and spacers correctly 1`] = `
             class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
           />
           <div
-            class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
           >
             <div
               class="c2"
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx
index bbadaba78a092..6c78e4ba4fa4c 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx
@@ -53,9 +53,7 @@ describe('FieldValueCell', () => {
     });
 
     test('it formats multiple values such that each value is displayed on a single line', () => {
-      expect(screen.getByTestId(`event-field-${hostIpData.field}`)).toHaveClass(
-        'euiFlexGroup--directionColumn'
-      );
+      expect(screen.getByTestId(`event-field-${hostIpData.field}`).className).toContain('column');
     });
   });
 
@@ -185,8 +183,8 @@ describe('FieldValueCell', () => {
     });
 
     test('it aligns items at the start of the group to prevent content from stretching (by default)', () => {
-      expect(screen.getByTestId(`event-field-${hostIpData.field}`)).toHaveClass(
-        'euiFlexGroup--alignItemsFlexStart'
+      expect(screen.getByTestId(`event-field-${hostIpData.field}`).className).toContain(
+        'flexStart'
       );
     });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
index fe99e22c448e4..230633da51a17 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
@@ -130,10 +130,10 @@ describe('HeaderSection', () => {
 
     expect(
       wrapper
-        .find('.euiFlexItem--flexGrowZero[data-test-subj="header-section-supplements"]')
-        .first()
-        .exists()
-    ).toBe(false);
+        .find('.euiFlexItem[data-test-subj="header-section-supplements"]')
+        .last()
+        .prop('className')
+    ).not.toContain('growZero');
   });
 
   test('it DOES NOT split the title and supplement areas evenly when split is false', () => {
@@ -147,10 +147,10 @@ describe('HeaderSection', () => {
 
     expect(
       wrapper
-        .find('.euiFlexItem--flexGrowZero[data-test-subj="header-section-supplements"]')
-        .first()
-        .exists()
-    ).toBe(true);
+        .find('.euiFlexItem[data-test-subj="header-section-supplements"]')
+        .last()
+        .prop('className')
+    ).toContain('growZero');
   });
 
   test('it renders an inspect button when an `id` is provided', () => {
@@ -264,8 +264,8 @@ describe('HeaderSection', () => {
     );
 
     expect(
-      wrapper.find('[data-test-subj="headerSectionOuterFlexGroup"]').first().getDOMNode()
-    ).not.toHaveClass('euiFlexGroup--alignItemsFlexStart');
+      wrapper.find('[data-test-subj="headerSectionOuterFlexGroup"]').last().getDOMNode().className
+    ).not.toContain('flexStart-flexStart');
   });
 
   test(`it uses the 'column' direction in the outer flex group by default`, () => {
@@ -278,8 +278,8 @@ describe('HeaderSection', () => {
     );
 
     expect(
-      wrapper.find('[data-test-subj="headerSectionOuterFlexGroup"]').first().getDOMNode()
-    ).toHaveClass('euiFlexGroup--directionColumn');
+      wrapper.find('[data-test-subj="headerSectionOuterFlexGroup"]').last().getDOMNode().className
+    ).toContain('column');
   });
 
   test('it uses the `outerDirection` prop to specify the direction of the outer flex group when it is provided', () => {
@@ -292,8 +292,8 @@ describe('HeaderSection', () => {
     );
 
     expect(
-      wrapper.find('[data-test-subj="headerSectionOuterFlexGroup"]').first().getDOMNode()
-    ).toHaveClass('euiFlexGroup--directionRow');
+      wrapper.find('[data-test-subj="headerSectionOuterFlexGroup"]').last().getDOMNode().className
+    ).toContain('row');
   });
 
   test('it defaults to center alignment in the inner flex group', () => {
@@ -306,8 +306,8 @@ describe('HeaderSection', () => {
     );
 
     expect(
-      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').first().getDOMNode()
-    ).toHaveClass('euiFlexGroup--alignItemsCenter');
+      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').last().getDOMNode().className
+    ).toContain('center');
   });
 
   test('it aligns items using the value of the `alignHeader` prop in the inner flex group when specified', () => {
@@ -320,8 +320,8 @@ describe('HeaderSection', () => {
     );
 
     expect(
-      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').first().getDOMNode()
-    ).toHaveClass('euiFlexGroup--alignItemsFlexEnd');
+      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').last().getDOMNode().className
+    ).toContain('flexEnd');
   });
 
   test('it does NOT default to center alignment in the inner flex group when the `stackHeader` prop is true', () => {
@@ -334,8 +334,8 @@ describe('HeaderSection', () => {
     );
 
     expect(
-      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').first().getDOMNode()
-    ).not.toHaveClass('euiFlexGroup--alignItemsCenter');
+      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').last().getDOMNode().className
+    ).not.toContain('center');
   });
 
   test('it does render everything but title when toggleStatus = true', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap
index f1325280b3afb..179ef9b666aad 100644
--- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap
@@ -6,7 +6,7 @@ Object {
   "baseElement": <body>
     <div />
     <div
-      class="euiOverlayMask"
+      class="euiOverlayMask emotion-euiOverlayMask-aboveHeader"
       data-euiportal="true"
       data-relative-to-header="above"
     >
@@ -92,7 +92,7 @@ Object {
                 class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
               />
               <div
-                class="euiCheckbox"
+                class="euiCheckbox emotion-euiCheckbox"
               >
                 <input
                   class="euiCheckbox__input"
@@ -130,7 +130,7 @@ Object {
               </span>
             </button>
             <button
-              class="euiButton emotion-euiButtonDisplay-m-isDisabled-m-fill-disabled"
+              class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-isDisabled-m-fill-disabled"
               data-test-subj="import-data-modal-button"
               disabled=""
               type="button"
diff --git a/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx b/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx
index 8073e3ebf34f5..31c417294e7f8 100644
--- a/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/inspect/modal.test.tsx
@@ -53,7 +53,7 @@ describe('Modal Inspect', () => {
         </TestProviders>
       );
 
-      wrapper.find('.euiTab').first().simulate('click');
+      wrapper.find('button.euiTab').first().simulate('click');
       wrapper.update();
 
       expect(
@@ -86,10 +86,10 @@ describe('Modal Inspect', () => {
         </TestProviders>
       );
 
-      wrapper.find('.euiTab').at(2).simulate('click');
+      wrapper.find('button.euiTab').at(2).simulate('click');
       wrapper.update();
 
-      expect(JSON.parse(wrapper.find('EuiCodeBlock').first().text())).toEqual({
+      expect(JSON.parse(wrapper.find('EuiCodeBlock').text())).toEqual({
         took: 880,
         timed_out: false,
         _shards: {
@@ -147,10 +147,10 @@ describe('Modal Inspect', () => {
         </TestProviders>
       );
 
-      wrapper.find('.euiTab').at(1).simulate('click');
+      wrapper.find('button.euiTab').at(1).simulate('click');
       wrapper.update();
 
-      expect(JSON.parse(wrapper.find('EuiCodeBlock').first().text())).toEqual({
+      expect(JSON.parse(wrapper.find('EuiCodeBlock').text())).toEqual({
         aggregations: {
           hosts: { cardinality: { field: 'host.name' } },
           hosts_histogram: {
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
index e8acf6b6374c0..9415d8d0a9b3b 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
@@ -239,9 +239,9 @@ describe('ThreatMatchComponent', () => {
       </ThemeProvider>
     );
 
-    expect(wrapper.find('[data-test-subj="entriesContainer"]').length).toEqual(4);
+    expect(wrapper.find('div[data-test-subj="entriesContainer"]').length).toEqual(2);
     wrapper.find('[data-test-subj="firstRowDeleteButton"] button').simulate('click');
-    expect(wrapper.find('[data-test-subj="entriesContainer"]').length).toEqual(2);
+    expect(wrapper.find('div[data-test-subj="entriesContainer"]').length).toEqual(1);
     wrapper.unmount();
   });
 
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/table_header_tooltip_cell.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/table_header_tooltip_cell.tsx
index 3ec474974917b..9e36a4656db42 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/table_header_tooltip_cell.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/table_header_tooltip_cell.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { EuiToolTip, EuiIcon, EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
+import { EuiToolTip, EuiIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 interface Props {
   title: string;
@@ -23,7 +23,7 @@ interface Props {
  * @param customTooltip React.ReactNode - any custom tooltip
  */
 const TableHeaderTooltipCellComponent = ({ title, tooltipContent, customTooltip }: Props) => (
-  <EuiFlexGrid gutterSize="none">
+  <EuiFlexGroup gutterSize="none">
     <EuiFlexItem style={{ width: 'calc(100% - 20px)' }}>
       <span className="eui-textTruncate">{title}</span>
     </EuiFlexItem>
@@ -38,7 +38,7 @@ const TableHeaderTooltipCellComponent = ({ title, tooltipContent, customTooltip
         />
       </EuiToolTip>
     )}
-  </EuiFlexGrid>
+  </EuiFlexGroup>
 );
 
 export const TableHeaderTooltipCell = React.memo(TableHeaderTooltipCellComponent);
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
index 4cb954f3b14e4..fc752b243f9b1 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
@@ -100,8 +100,8 @@ describe('AlertsCountPanel', () => {
       );
 
       expect(
-        wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').first().getDOMNode()
-      ).toHaveClass('euiFlexGroup--alignItemsFlexEnd');
+        wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').last().getDOMNode().className
+      ).toContain('flexEnd');
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
index 2288132ffd020..c47353aa04b06 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
@@ -165,8 +165,8 @@ describe('AlertsHistogramPanel', () => {
     );
 
     expect(
-      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').first().getDOMNode()
-    ).toHaveClass('euiFlexGroup--alignItemsFlexEnd');
+      wrapper.find('[data-test-subj="headerSectionInnerFlexGroup"]').last().getDOMNode().className
+    ).toContain('flexEnd');
   });
 
   describe('inspect button', () => {
@@ -211,9 +211,9 @@ describe('AlertsHistogramPanel', () => {
       </TestProviders>
     );
 
-    expect(wrapper.find('[data-test-subj="panelFlexGroup"]').first().getDOMNode()).toHaveClass(
-      'euiFlexGroup--alignItemsFlexStart'
-    );
+    expect(
+      wrapper.find('[data-test-subj="panelFlexGroup"]').last().getDOMNode().className
+    ).toContain('flexStart');
   });
 
   test('it invokes onFieldSelected when a field is selected', async () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.tsx
index 5f2d67cdd8455..4da7f038cf654 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.tsx
@@ -42,7 +42,7 @@ const timeTypeOptions = [
 
 // move optional label to the end of input
 const StyledLabelAppend = styled(EuiFlexItem)`
-  &.euiFlexItem.euiFlexItem--flexGrowZero {
+  &.euiFlexItem {
     margin-left: 31px;
   }
 `;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx
index 30bd1396d640f..52e96c088c200 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx
@@ -6,7 +6,6 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
-import { css } from '@emotion/css';
 import { EuiCard, EuiFlexGrid, EuiFlexItem, EuiFormRow, EuiIcon } from '@elastic/eui';
 
 import type { Type } from '@kbn/securitysolution-io-ts-alerting-types';
@@ -100,23 +99,6 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
     [ruleType, setNewTerms]
   );
 
-  // TODO: custom css shouldn't be necessary after https://github.com/elastic/eui/issues/6345
-  // tested this placeholder fix on mac in Chrome, Firefox, Safari, and Edge
-  // with multiple zoom levels and with keyboard <tab> navigation
-  // and in a responsive design / mobile view
-  const cardStyles = css`
-    padding-bottom: 60px;
-    position: relative;
-
-    button {
-      position: absolute;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      border-radius: 0;
-    }
-  `;
-
   return (
     <EuiFormRow
       fullWidth
@@ -135,7 +117,6 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
               icon={<EuiIcon size="xl" type="search" />}
               selectable={querySelectableConfig}
               layout="horizontal"
-              className={cardStyles}
             />
           </EuiFlexItem>
         )}
@@ -150,7 +131,6 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
               isDisabled={mlSelectableConfig.isDisabled && !mlSelectableConfig.isSelected}
               selectable={mlSelectableConfig}
               layout="horizontal"
-              className={cardStyles}
             />
           </EuiFlexItem>
         )}
@@ -164,7 +144,6 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
               icon={<EuiIcon size="l" type="indexFlush" />}
               selectable={thresholdSelectableConfig}
               layout="horizontal"
-              className={cardStyles}
             />
           </EuiFlexItem>
         )}
@@ -178,7 +157,6 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
               icon={<EuiIcon size="l" type="eql" />}
               selectable={eqlSelectableConfig}
               layout="horizontal"
-              className={cardStyles}
             />
           </EuiFlexItem>
         )}
@@ -192,7 +170,6 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
               icon={<EuiIcon size="l" type="list" />}
               selectable={threatMatchSelectableConfig}
               layout="horizontal"
-              className={cardStyles}
             />
           </EuiFlexItem>
         )}
@@ -206,7 +183,6 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
               icon={<EuiIcon size="l" type="magnifyWithPlus" />}
               selectable={newTermsSelectableConfig}
               layout="horizontal"
-              className={cardStyles}
             />
           </EuiFlexItem>
         )}
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/index.tsx
index f1df3cf0f97d6..fccb839c3236c 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/index.tsx
@@ -9,7 +9,7 @@ import { EuiTitle, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elasti
 import type { TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
 import React, { useCallback, useMemo } from 'react';
 import { find } from 'lodash/fp';
-import type { FlexItemGrowSize } from '@elastic/eui/src/components/flex/flex_item';
+import type { EuiFlexItemProps } from '@elastic/eui';
 import { TimelineId } from '../../../../../../../common/types';
 import { isAlertFromEndpointEvent } from '../../../../../../common/utils/endpoint_alert_check';
 import { SummaryValueCell } from '../../../../../../common/components/event_details/table/summary_value_cell';
@@ -49,7 +49,7 @@ export interface HostPanelProps {
 
 const HostPanelSection: React.FC<{
   title?: string | React.ReactElement;
-  grow?: FlexItemGrowSize;
+  grow?: EuiFlexItemProps['grow'];
 }> = ({ grow, title, children }) =>
   children ? (
     <EuiFlexItem grow={grow}>
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/rule_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/rule_panel/index.tsx
index a6425ebf59461..4ef114fc07889 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/rule_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/rule_panel/index.tsx
@@ -11,7 +11,7 @@ import type { TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
 import React, { useCallback, useMemo } from 'react';
 import { css } from '@emotion/react';
 import { find } from 'lodash/fp';
-import type { FlexItemGrowSize } from '@elastic/eui/src/components/flex/flex_item';
+import type { EuiFlexItemProps } from '@elastic/eui/src/components/flex/flex_item';
 import {
   ALERT_RISK_SCORE,
   ALERT_RULE_DESCRIPTION,
@@ -55,7 +55,7 @@ const threatTacticContainerStyles = css`
 interface RuleSectionProps {
   ['data-test-subj']?: string;
   title: string;
-  grow?: FlexItemGrowSize;
+  grow?: EuiFlexItemProps['grow'];
 }
 const RuleSection: React.FC<RuleSectionProps> = ({
   grow,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/user_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/user_panel/index.tsx
index ab58623467933..6813ea61a4dc9 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/user_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/user_panel/index.tsx
@@ -9,7 +9,7 @@ import { EuiTitle, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elasti
 import type { TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
 import React, { useCallback, useMemo } from 'react';
 import { find } from 'lodash/fp';
-import type { FlexItemGrowSize } from '@elastic/eui/src/components/flex/flex_item';
+import type { EuiFlexItemProps } from '@elastic/eui/src/components/flex/flex_item';
 import { useRiskScore } from '../../../../../../risk_score/containers';
 import { RiskScoreEntity } from '../../../../../../../common/search_strategy';
 import { getEmptyTagValue } from '../../../../../../common/components/empty_value';
@@ -41,7 +41,7 @@ export interface UserPanelProps {
 
 const UserPanelSection: React.FC<{
   title?: string | React.ReactElement;
-  grow?: FlexItemGrowSize;
+  grow?: EuiFlexItemProps['grow'];
 }> = ({ grow, title, children }) =>
   children ? (
     <EuiFlexItem grow={grow}>
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/wrappers.tsx b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/wrappers.tsx
index b9d900a3284db..fd9cf26c7280e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/wrappers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/wrappers.tsx
@@ -7,11 +7,14 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+import type { EuiFlexItemProps } from '@elastic/eui';
 import { css } from '@emotion/react';
-import type { FlexItemGrowSize } from '@elastic/eui/src/components/flex/flex_item';
 import { HoverVisibilityContainer } from '../../../../../common/components/hover_visibility_container';
 
-export const SummaryColumn: React.FC<{ grow?: FlexItemGrowSize }> = ({ children, grow }) => (
+export const SummaryColumn: React.FC<{ grow?: EuiFlexItemProps['grow'] }> = ({
+  children,
+  grow,
+}) => (
   <EuiFlexItem grow={grow}>
     <EuiFlexGroup
       direction="column"
@@ -25,7 +28,7 @@ export const SummaryColumn: React.FC<{ grow?: FlexItemGrowSize }> = ({ children,
   </EuiFlexItem>
 );
 
-export const SummaryRow: React.FC<{ grow?: FlexItemGrowSize }> = ({ children, grow }) => (
+export const SummaryRow: React.FC<{ grow?: EuiFlexItemProps['grow'] }> = ({ children, grow }) => (
   <EuiFlexItem grow={grow}>
     <EuiFlexGroup direction="row" wrap>
       {children}
@@ -34,7 +37,7 @@ export const SummaryRow: React.FC<{ grow?: FlexItemGrowSize }> = ({ children, gr
 );
 
 export const SummaryPanel: React.FC<{
-  grow?: FlexItemGrowSize;
+  grow?: EuiFlexItemProps['grow'];
   title: string;
   description?: string;
   actionsClassName?: string;
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/actions_log_date_range_picker.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/actions_log_date_range_picker.tsx
index c1c18c4c3cd3c..af0988040f80e 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/actions_log_date_range_picker.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/components/actions_log_date_range_picker.tsx
@@ -30,7 +30,7 @@ export interface DateRangePickerValues {
 }
 
 const DatePickerWrapper = euiStyled.div`
-  padding-bottom: ${(props) => `${props.theme.eui.euiCodeBlockPaddingModifiers.paddingLarge}`};
+  padding-bottom: ${(props) => `${props.theme.eui.euiSizeL}`};
 `;
 
 export const ActionLogDateRangePicker = memo(
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx
index 8d38b22508be2..4ecd860a4876e 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/use_response_actions_log_table.tsx
@@ -50,11 +50,11 @@ const customDescriptionListCss = css`
     > .euiDescriptionList__title {
       color: ${(props) => props.theme.eui.euiColorDarkShade};
       font-size: ${(props) => props.theme.eui.euiFontSizeXS};
-      margin-top: ${(props) => props.theme.eui.euiSizeS};
     }
 
+    > .euiDescriptionList__title,
     > .euiDescriptionList__description {
-      font-weight: ${(props) => props.theme.eui.euiFontWeightSemiBold};
+      font-weight: ${(props) => props.theme.eui.euiFontWeightRegular};
       margin-top: ${(props) => props.theme.eui.euiSizeS};
     }
   }
@@ -69,7 +69,7 @@ const StyledDescriptionList = euiStyled(EuiDescriptionList).attrs({
 
 // output section styles
 const topSpacingCss = css`
-  ${(props) => `${props.theme.eui.euiCodeBlockPaddingModifiers.paddingMedium} 0`}
+  ${(props) => `${props.theme.eui.euiSize} 0`}
 `;
 const dashedBorderCss = css`
   ${(props) => `1px dashed ${props.theme.eui.euiColorDisabled}`};
diff --git a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
index 971c5103741d7..ffa8ecf426ac2 100644
--- a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
@@ -79,7 +79,7 @@ const RootContainer = styled.div`
   padding-top: ${({ theme }) => theme.eui.euiSizeXS};
 
   .body {
-    min-height: ${({ theme }) => theme.eui.gutterTypes.gutterExtraLarge};
+    min-height: ${({ theme }) => theme.eui.euiSizeXXL};
 
     &-content {
       position: relative;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/agents_summary.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/agents_summary.tsx
index 4750b59eccd3b..712b5991fefb9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/agents_summary.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/agents_summary.tsx
@@ -84,7 +84,7 @@ export const AgentsSummary = memo<AgentsSummaryProps>((props) => {
             grow={false}
             key={key}
             style={{
-              marginRight: key === 'total' ? theme.eui.gutterTypes.gutterExtraLarge : undefined,
+              marginRight: key === 'total' ? theme.eui.euiSizeXXL : undefined,
             }}
           >
             <EuiDescriptionList
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx
index d1a10af88b394..cc42155b57e77 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx
@@ -26,7 +26,7 @@ const LockedPolicyDiv = styled.div`
     }
   }
   .lockedCardDescription {
-    padding: 0 ${(props) => props.theme.eui.fractions.thirds.percentage};
+    padding: 0 33.3%;
   }
 `;
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap
index 6337b972dbb43..bf7c1251f5202 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap
@@ -15,10 +15,10 @@ exports[`Field Renderers #autonomousSystemRenderer it renders correctly against
 }
 
 <div
-    class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
         class=""
@@ -53,12 +53,12 @@ exports[`Field Renderers #autonomousSystemRenderer it renders correctly against
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       /
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
         class=""
@@ -231,10 +231,10 @@ exports[`Field Renderers #locationRenderer it renders correctly against snapshot
 }
 
 <div
-    class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+    class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
         class=""
@@ -270,7 +270,7 @@ exports[`Field Renderers #locationRenderer it renders correctly against snapshot
     </div>
     , 
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
         class=""
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/flyout/__snapshots__/index.test.tsx.snap
index 6163e0ab42b90..1496c6a65a5e6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/__snapshots__/index.test.tsx.snap
@@ -46,10 +46,10 @@ exports[`Flyout rendering it renders correctly against snapshot 1`] = `
       style="background-color: rgb(255, 255, 255); color: rgb(52, 55, 65);"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+        class="euiFlexGroup emotion-euiFlexGroup-s-flexStart-center-row"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class="euiPopover emotion-euiPopover"
@@ -75,7 +75,7 @@ exports[`Flyout rendering it renders correctly against snapshot 1`] = `
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero c0"
+          class="euiFlexItem c0 emotion-euiFlexItem-growZero"
         >
           <button
             aria-label="Open timeline Untitled timeline"
@@ -91,10 +91,10 @@ exports[`Flyout rendering it renders correctly against snapshot 1`] = `
                 class="euiButtonEmpty__text"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                  class="euiFlexGroup emotion-euiFlexGroup-none-flexStart-center-row"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <span
                       class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
@@ -103,10 +103,10 @@ exports[`Flyout rendering it renders correctly against snapshot 1`] = `
                         class="euiHealth c2 emotion-euiHealth-s"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+                          class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-row"
                         >
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               color="warning"
@@ -114,19 +114,19 @@ exports[`Flyout rendering it renders correctly against snapshot 1`] = `
                             />
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           />
                         </div>
                       </div>
                     </span>
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero c3"
+                    class="euiFlexItem c3 emotion-euiFlexItem-growZero"
                   >
                     Untitled timeline
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div />
                   </div>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx
index acd6016e737a3..0d8dd0f637a5e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.tsx
@@ -38,7 +38,7 @@ const StyledEuiFlyout = styled(EuiFlyout)<EuiFlyoutProps>`
 const IndexPatternFieldEditorOverlayGlobalStyle = createGlobalStyle<{
   theme: { eui: { euiZLevel5: number } };
 }>`
-  .indexPatternFieldEditorMaskOverlay {
+  .euiOverlayMask.indexPatternFieldEditorMaskOverlay {
     ${({ theme }) => `
     z-index: ${theme.eui.euiZLevel5};
   `}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/netflow/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/netflow/__snapshots__/index.test.tsx.snap
index 27b5599625d87..4103c9597502b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/netflow/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/netflow/__snapshots__/index.test.tsx.snap
@@ -192,25 +192,25 @@ tr:hover .c3:focus::before {
 }
 
 <div
-    class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive euiFlexGroup--wrap"
+    class="euiFlexGroup emotion-euiFlexGroup-wrap-none-center-center-column"
     data-test-subj="netflow-rows"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-none-center-stretch-row"
         data-test-subj="netflow-columns"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero c0"
+          class="euiFlexItem c0 emotion-euiFlexItem-growZero"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-none-center-flexStart-column"
             data-test-subj="user-process"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
@@ -288,7 +288,7 @@ tr:hover .c3:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
@@ -368,14 +368,14 @@ tr:hover .c3:focus::before {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero c0"
+          class="euiFlexItem c0 emotion-euiFlexItem-growZero"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-none-center-flexStart-column"
             data-test-subj="duration-and-start-group"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
@@ -447,7 +447,7 @@ tr:hover .c3:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
@@ -515,7 +515,7 @@ tr:hover .c3:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
@@ -585,19 +585,19 @@ tr:hover .c3:focus::before {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-none-center-center-column"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-center-row"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero c7"
+                  class="euiFlexItem c7 emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -675,7 +675,7 @@ tr:hover .c3:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero c7"
+                  class="euiFlexItem c7 emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -748,7 +748,7 @@ tr:hover .c3:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero c7"
+                  class="euiFlexItem c7 emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -814,7 +814,7 @@ tr:hover .c3:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero c7"
+                  class="euiFlexItem c7 emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -880,7 +880,7 @@ tr:hover .c3:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero c7"
+                  class="euiFlexItem c7 emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -953,7 +953,7 @@ tr:hover .c3:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -1028,13 +1028,13 @@ tr:hover .c3:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero c9"
+              class="euiFlexItem c9 emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-stretch-row"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <span
                     class="euiBadge emotion-euiBadge-hollow"
@@ -1048,11 +1048,11 @@ tr:hover .c3:focus::before {
                         class="euiBadge__text emotion-euiBadge__text"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-column"
                           data-test-subj="source-ip-group"
                         >
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
                               class="c10"
@@ -1061,19 +1061,19 @@ tr:hover .c3:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
-                              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                              class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                             >
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
+                                class="euiFlexItem emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -1140,13 +1140,13 @@ tr:hover .c3:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem"
+                                    class="euiFlexItem emotion-euiFlexItem-grow-1"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <span
                                           class="c12"
@@ -1156,7 +1156,7 @@ tr:hover .c3:focus::before {
                                         </span>
                                       </div>
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class="c13"
@@ -1190,19 +1190,19 @@ tr:hover .c3:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem"
+                            class="euiFlexItem emotion-euiFlexItem-grow-1"
                           >
                             <div
-                              class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                              class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                             >
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -1264,13 +1264,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -1332,13 +1332,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <span
                                       class="c15"
@@ -1348,7 +1348,7 @@ tr:hover .c3:focus::before {
                                     </span>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -1410,13 +1410,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -1478,13 +1478,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -1553,16 +1553,16 @@ tr:hover .c3:focus::before {
                   </span>
                 </div>
                 <div
-                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive c16"
+                  class="euiFlexGroup c16 emotion-euiFlexGroup-none-center-center-column"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-center-row"
                     >
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           class="c17"
@@ -1570,7 +1570,7 @@ tr:hover .c3:focus::before {
                         />
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <div
                           class=""
@@ -1641,7 +1641,7 @@ tr:hover .c3:focus::before {
                         </div>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           class="c17"
@@ -1649,7 +1649,7 @@ tr:hover .c3:focus::before {
                         />
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <div
                           class=""
@@ -1715,7 +1715,7 @@ tr:hover .c3:focus::before {
                         </div>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           class="c17"
@@ -1723,7 +1723,7 @@ tr:hover .c3:focus::before {
                         />
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           color="subdued"
@@ -1734,13 +1734,13 @@ tr:hover .c3:focus::before {
                     </div>
                   </div>
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiFlexItem emotion-euiFlexItem-growZero"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-center-row"
                     >
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           color="subdued"
@@ -1749,7 +1749,7 @@ tr:hover .c3:focus::before {
                         />
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           class="c20"
@@ -1757,7 +1757,7 @@ tr:hover .c3:focus::before {
                         />
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <div
                           class=""
@@ -1828,7 +1828,7 @@ tr:hover .c3:focus::before {
                         </div>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           class="c20"
@@ -1836,7 +1836,7 @@ tr:hover .c3:focus::before {
                         />
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <div
                           class=""
@@ -1902,7 +1902,7 @@ tr:hover .c3:focus::before {
                         </div>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <span
                           class="c20"
@@ -1913,7 +1913,7 @@ tr:hover .c3:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <span
                     class="euiBadge emotion-euiBadge-hollow"
@@ -1927,11 +1927,11 @@ tr:hover .c3:focus::before {
                         class="euiBadge__text emotion-euiBadge__text"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-column"
                           data-test-subj="destination-ip-group"
                         >
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
                               class="c10"
@@ -1940,19 +1940,19 @@ tr:hover .c3:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
-                              class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                              class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                             >
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
+                                class="euiFlexItem emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -2019,13 +2019,13 @@ tr:hover .c3:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem"
+                                    class="euiFlexItem emotion-euiFlexItem-grow-1"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <span
                                           class="c12"
@@ -2035,7 +2035,7 @@ tr:hover .c3:focus::before {
                                         </span>
                                       </div>
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class="c13"
@@ -2069,19 +2069,19 @@ tr:hover .c3:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem"
+                            class="euiFlexItem emotion-euiFlexItem-grow-1"
                           >
                             <div
-                              class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                              class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                             >
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -2143,13 +2143,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -2211,13 +2211,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <span
                                       class="c15"
@@ -2227,7 +2227,7 @@ tr:hover .c3:focus::before {
                                     </span>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -2289,13 +2289,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -2357,13 +2357,13 @@ tr:hover .c3:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero c14"
+                                class="euiFlexItem c14 emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
                                       class=""
@@ -2438,14 +2438,14 @@ tr:hover .c3:focus::before {
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+        class="euiFlexGroup emotion-euiFlexGroup-none-center-center-column"
         data-test-subj="fingerprints-group"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class=""
@@ -2547,7 +2547,7 @@ tr:hover .c3:focus::before {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class=""
@@ -2649,7 +2649,7 @@ tr:hover .c3:focus::before {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             class=""
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
index ac899e8dcb80d..5763637266e2d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
@@ -41,13 +41,13 @@ Array [
 }
 
 <div
-    class="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c0"
+    class="euiFlexGroup c0 emotion-euiFlexGroup-responsive-wrap-none-spaceBetween-stretch-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     />
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <button
         aria-label="close"
@@ -107,10 +107,10 @@ Array [
     data-test-subj="side-panel-flyout-footer"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexEnd-stretch-row"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       />
     </div>
   </div>,
@@ -158,10 +158,10 @@ exports[`Details Panel Component DetailsPanel:EventDetails: rendering it should
     class="euiFlyoutHeader emotion-euiFlyoutHeader"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c0"
+      class="euiFlexGroup c0 emotion-euiFlexGroup-responsive-wrap-none-spaceBetween-stretch-row"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       />
     </div>
   </div>
@@ -169,7 +169,7 @@ exports[`Details Panel Component DetailsPanel:EventDetails: rendering it should
     class="euiFlyoutBody c1 emotion-euiFlyoutBody"
   >
     <div
-      class="euiFlyoutBody__overflow css-1fk8opf-noBanner"
+      class="euiFlyoutBody__overflow css-18yrfj9-noBanner"
       tabindex="0"
     >
       <div
@@ -219,10 +219,10 @@ exports[`Details Panel Component DetailsPanel:EventDetails: rendering it should
     data-test-subj="side-panel-flyout-footer"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexEnd-stretch-row"
     >
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       />
     </div>
   </div>
@@ -313,11 +313,11 @@ exports[`Details Panel Component DetailsPanel:HostDetails: rendering it should r
   data-test-subj="hoverVisibilityContainer"
 >
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive c1"
+    class="euiFlexGroup c1 emotion-euiFlexGroup-l-flexStart-stretch-column"
     data-test-subj="host-overview"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -370,7 +370,7 @@ exports[`Details Panel Component DetailsPanel:HostDetails: rendering it should r
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -421,7 +421,7 @@ exports[`Details Panel Component DetailsPanel:HostDetails: rendering it should r
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -486,7 +486,7 @@ exports[`Details Panel Component DetailsPanel:HostDetails: rendering it should r
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -554,11 +554,11 @@ exports[`Details Panel Component DetailsPanel:HostDetails: rendering it should r
       class="c4"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive c5"
+        class="euiFlexGroup c5 emotion-euiFlexGroup-s-center-center-column"
         overlay="[object Object]"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <span
             aria-label="Loading"
@@ -657,10 +657,10 @@ exports[`Details Panel Component DetailsPanel:NetworkDetails: rendering it shoul
   data-test-subj="hoverVisibilityContainer"
 >
   <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive c1"
+    class="euiFlexGroup c1 emotion-euiFlexGroup-l-flexStart-stretch-column"
   >
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -697,7 +697,7 @@ exports[`Details Panel Component DetailsPanel:NetworkDetails: rendering it shoul
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -736,7 +736,7 @@ exports[`Details Panel Component DetailsPanel:NetworkDetails: rendering it shoul
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -773,7 +773,7 @@ exports[`Details Panel Component DetailsPanel:NetworkDetails: rendering it shoul
       </dl>
     </div>
     <div
-      class="euiFlexItem"
+      class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <dl
         class="euiDescriptionList c2 emotion-euiDescriptionList-row-left"
@@ -826,11 +826,11 @@ exports[`Details Panel Component DetailsPanel:NetworkDetails: rendering it shoul
       class="c4"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive c5"
+        class="euiFlexGroup c5 emotion-euiFlexGroup-s-center-center-column"
         overlay="[object Object]"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <span
             aria-label="Loading"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap
index d07d676e90e9a..a7cc14a0ba23d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`SessionUserHostWorkingDir rendering it renders the default SessionUserHostWorkingDir 1`] = `
 <span
-  className="euiFlexItem euiFlexItem--flexGrowZero"
+  css="unknown styles"
 >
   <SessionUserHostWorkingDir
     contextId="contextid-123"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap
index 4a4c047d4cb1e..cfc340d68383e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap
@@ -216,25 +216,25 @@ tr:hover .c5:focus::before {
       class="c1"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive euiFlexGroup--wrap"
+        class="euiFlexGroup emotion-euiFlexGroup-wrap-none-center-center-column"
         data-test-subj="netflow-rows"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+            class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-none-center-stretch-row"
             data-test-subj="netflow-columns"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero c2"
+              class="euiFlexItem c2 emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-flexStart-column"
                 data-test-subj="user-process"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -322,7 +322,7 @@ tr:hover .c5:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -412,14 +412,14 @@ tr:hover .c5:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero c2"
+              class="euiFlexItem c2 emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsFlexStart euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-flexStart-column"
                 data-test-subj="duration-and-start-group"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -501,7 +501,7 @@ tr:hover .c5:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -579,7 +579,7 @@ tr:hover .c5:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
                     class=""
@@ -659,19 +659,19 @@ tr:hover .c5:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
-                class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                class="euiFlexGroup emotion-euiFlexGroup-none-center-center-column"
               >
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                  class="euiFlexItem emotion-euiFlexItem-growZero"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-center-row"
                   >
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero c9"
+                      class="euiFlexItem c9 emotion-euiFlexItem-growZero"
                     >
                       <div
                         class=""
@@ -759,7 +759,7 @@ tr:hover .c5:focus::before {
                       </div>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero c9"
+                      class="euiFlexItem c9 emotion-euiFlexItem-growZero"
                     >
                       <div
                         class=""
@@ -842,7 +842,7 @@ tr:hover .c5:focus::before {
                       </div>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero c9"
+                      class="euiFlexItem c9 emotion-euiFlexItem-growZero"
                     >
                       <div
                         class=""
@@ -918,7 +918,7 @@ tr:hover .c5:focus::before {
                       </div>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero c9"
+                      class="euiFlexItem c9 emotion-euiFlexItem-growZero"
                     >
                       <div
                         class=""
@@ -994,7 +994,7 @@ tr:hover .c5:focus::before {
                       </div>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero c9"
+                      class="euiFlexItem c9 emotion-euiFlexItem-growZero"
                     >
                       <div
                         class=""
@@ -1077,7 +1077,7 @@ tr:hover .c5:focus::before {
                       </div>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
+                      class="euiFlexItem emotion-euiFlexItem-growZero"
                     >
                       <div
                         class=""
@@ -1162,13 +1162,13 @@ tr:hover .c5:focus::before {
                   </div>
                 </div>
                 <div
-                  class="euiFlexItem euiFlexItem--flexGrowZero c11"
+                  class="euiFlexItem c11 emotion-euiFlexItem-growZero"
                 >
                   <div
-                    class="euiFlexGroup euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                    class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-stretch-row"
                   >
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
+                      class="euiFlexItem emotion-euiFlexItem-growZero"
                     >
                       <span
                         class="euiBadge emotion-euiBadge-hollow"
@@ -1182,11 +1182,11 @@ tr:hover .c5:focus::before {
                             class="euiBadge__text emotion-euiBadge__text"
                           >
                             <div
-                              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                              class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-column"
                               data-test-subj="source-ip-group"
                             >
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
+                                class="euiFlexItem emotion-euiFlexItem-growZero"
                               >
                                 <div
                                   class="c12"
@@ -1195,19 +1195,19 @@ tr:hover .c5:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
+                                class="euiFlexItem emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -1284,13 +1284,13 @@ tr:hover .c5:focus::before {
                                         </div>
                                       </div>
                                       <div
-                                        class="euiFlexItem"
+                                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                                       >
                                         <div
-                                          class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                         >
                                           <div
-                                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                                            class="euiFlexItem emotion-euiFlexItem-growZero"
                                           >
                                             <span
                                               class="c14"
@@ -1300,7 +1300,7 @@ tr:hover .c5:focus::before {
                                             </span>
                                           </div>
                                           <div
-                                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                                            class="euiFlexItem emotion-euiFlexItem-growZero"
                                           >
                                             <div
                                               class=""
@@ -1399,19 +1399,19 @@ tr:hover .c5:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem"
+                                class="euiFlexItem emotion-euiFlexItem-grow-1"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -1483,13 +1483,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -1561,13 +1561,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <span
                                           class="c17"
@@ -1577,7 +1577,7 @@ tr:hover .c5:focus::before {
                                         </span>
                                       </div>
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -1649,13 +1649,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -1727,13 +1727,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -1812,16 +1812,16 @@ tr:hover .c5:focus::before {
                       </span>
                     </div>
                     <div
-                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive c18"
+                      class="euiFlexGroup c18 emotion-euiFlexGroup-none-center-center-column"
                     >
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-center-row"
                         >
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               class="c19"
@@ -1829,7 +1829,7 @@ tr:hover .c5:focus::before {
                             />
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
                               class=""
@@ -1910,7 +1910,7 @@ tr:hover .c5:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               class="c19"
@@ -1918,7 +1918,7 @@ tr:hover .c5:focus::before {
                             />
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
                               class=""
@@ -1994,7 +1994,7 @@ tr:hover .c5:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               class="c19"
@@ -2002,7 +2002,7 @@ tr:hover .c5:focus::before {
                             />
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               color="subdued"
@@ -2013,13 +2013,13 @@ tr:hover .c5:focus::before {
                         </div>
                       </div>
                       <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                        class="euiFlexItem emotion-euiFlexItem-growZero"
                       >
                         <div
-                          class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-center-center-row"
                         >
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               color="subdued"
@@ -2028,7 +2028,7 @@ tr:hover .c5:focus::before {
                             />
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               class="c22"
@@ -2036,7 +2036,7 @@ tr:hover .c5:focus::before {
                             />
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
                               class=""
@@ -2117,7 +2117,7 @@ tr:hover .c5:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               class="c22"
@@ -2125,7 +2125,7 @@ tr:hover .c5:focus::before {
                             />
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <div
                               class=""
@@ -2201,7 +2201,7 @@ tr:hover .c5:focus::before {
                             </div>
                           </div>
                           <div
-                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                            class="euiFlexItem emotion-euiFlexItem-growZero"
                           >
                             <span
                               class="c22"
@@ -2212,7 +2212,7 @@ tr:hover .c5:focus::before {
                       </div>
                     </div>
                     <div
-                      class="euiFlexItem euiFlexItem--flexGrowZero"
+                      class="euiFlexItem emotion-euiFlexItem-growZero"
                     >
                       <span
                         class="euiBadge emotion-euiBadge-hollow"
@@ -2226,11 +2226,11 @@ tr:hover .c5:focus::before {
                             class="euiBadge__text emotion-euiBadge__text"
                           >
                             <div
-                              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+                              class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-column"
                               data-test-subj="destination-ip-group"
                             >
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
+                                class="euiFlexItem emotion-euiFlexItem-growZero"
                               >
                                 <div
                                   class="c12"
@@ -2239,19 +2239,19 @@ tr:hover .c5:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
+                                class="euiFlexItem emotion-euiFlexItem-growZero"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                                    class="euiFlexItem emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -2328,13 +2328,13 @@ tr:hover .c5:focus::before {
                                         </div>
                                       </div>
                                       <div
-                                        class="euiFlexItem"
+                                        class="euiFlexItem emotion-euiFlexItem-grow-1"
                                       >
                                         <div
-                                          class="euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                          class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-stretch-row"
                                         >
                                           <div
-                                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                                            class="euiFlexItem emotion-euiFlexItem-growZero"
                                           >
                                             <span
                                               class="c14"
@@ -2344,7 +2344,7 @@ tr:hover .c5:focus::before {
                                             </span>
                                           </div>
                                           <div
-                                            class="euiFlexItem euiFlexItem--flexGrowZero"
+                                            class="euiFlexItem emotion-euiFlexItem-growZero"
                                           >
                                             <div
                                               class=""
@@ -2443,19 +2443,19 @@ tr:hover .c5:focus::before {
                                 </div>
                               </div>
                               <div
-                                class="euiFlexItem"
+                                class="euiFlexItem emotion-euiFlexItem-grow-1"
                               >
                                 <div
-                                  class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                  class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                 >
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -2527,13 +2527,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -2605,13 +2605,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <span
                                           class="c17"
@@ -2621,7 +2621,7 @@ tr:hover .c5:focus::before {
                                         </span>
                                       </div>
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -2693,13 +2693,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -2771,13 +2771,13 @@ tr:hover .c5:focus::before {
                                     </div>
                                   </div>
                                   <div
-                                    class="euiFlexItem euiFlexItem--flexGrowZero c16"
+                                    class="euiFlexItem c16 emotion-euiFlexItem-growZero"
                                   >
                                     <div
-                                      class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+                                      class="euiFlexGroup emotion-euiFlexGroup-responsive-none-flexStart-center-row"
                                     >
                                       <div
-                                        class="euiFlexItem euiFlexItem--flexGrowZero"
+                                        class="euiFlexItem emotion-euiFlexItem-growZero"
                                       >
                                         <div
                                           class=""
@@ -2862,14 +2862,14 @@ tr:hover .c5:focus::before {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
+            class="euiFlexGroup emotion-euiFlexGroup-none-center-center-column"
             data-test-subj="fingerprints-group"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
@@ -2981,7 +2981,7 @@ tr:hover .c5:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
@@ -3093,7 +3093,7 @@ tr:hover .c5:focus::before {
               </div>
             </div>
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexItem emotion-euiFlexItem-growZero"
             >
               <div
                 class=""
diff --git a/x-pack/plugins/session_view/public/components/process_tree_alert/__snapshots__/index.test.tsx.snap b/x-pack/plugins/session_view/public/components/process_tree_alert/__snapshots__/index.test.tsx.snap
index 618b60a2e7088..7336b886ea62e 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_alert/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/session_view/public/components/process_tree_alert/__snapshots__/index.test.tsx.snap
@@ -10,11 +10,11 @@ Object {
         data-id="6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
       >
         <div
-          class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-s-flexStart-center-row"
           data-test-subj="sessionView:sessionViewAlertDetail-6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <button
               aria-label="expand"
@@ -31,7 +31,7 @@ Object {
             </button>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <span
               class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
@@ -43,7 +43,7 @@ Object {
             </span>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
               css="[object Object]"
@@ -57,7 +57,7 @@ Object {
             </div>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <span
               class="euiBadge emotion-EuiInnerText"
@@ -76,7 +76,7 @@ Object {
             </span>
           </div>
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <span
               class="euiBadge emotion-EuiInnerText"
@@ -104,11 +104,11 @@ Object {
       data-id="6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap"
+        class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-s-flexStart-center-row"
         data-test-subj="sessionView:sessionViewAlertDetail-6bb22512e0e588d1a2449b61f164b216e366fba2de39e65d002ae734d71a6c38"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <button
             aria-label="expand"
@@ -125,7 +125,7 @@ Object {
           </button>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <span
             class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
@@ -137,7 +137,7 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <div
             css="[object Object]"
@@ -151,7 +151,7 @@ Object {
           </div>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <span
             class="euiBadge emotion-EuiInnerText"
@@ -170,7 +170,7 @@ Object {
           </span>
         </div>
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexItem emotion-euiFlexItem-growZero"
         >
           <span
             class="euiBadge emotion-EuiInnerText"
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
index 681e0aaa021dd..715d385f0de26 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
@@ -748,7 +748,7 @@ describe('<SnapshotRestoreHome />', () => {
               const { find } = testBed;
 
               const tabs = find('snapshotDetail.tab');
-              const selectedTab = find('snapshotDetail').find('.euiTab-isSelected');
+              const selectedTab = find('snapshotDetail').find('.euiTab-isSelected').last();
 
               expect(selectedTab.instance()).toBe(tabs.at(0).instance());
             });
diff --git a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap
index 14528de235c9f..f5f4c35f0edde 100644
--- a/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap
+++ b/x-pack/plugins/stack_alerts/public/rule_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap
@@ -6,7 +6,6 @@ exports[`should render with error when data view does not have geo_point field 1
     describedByIds={Array []}
     display="row"
     error="Data view does not contain any allowed geospatial fields. Must have one of type geo_point."
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={true}
@@ -37,7 +36,6 @@ exports[`should render without error after mounting 1`] = `
     describedByIds={Array []}
     display="row"
     error=""
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     isInvalid={false}
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_status.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_status.test.tsx.snap
index f74952f9c860c..da653f8e40470 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_status.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_status.test.tsx.snap
@@ -10,10 +10,10 @@ exports[`CertStatus renders expected elements for valid props 1`] = `
   class="euiHealth emotion-euiHealth-s"
 >
   <div
-    class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+    class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-row"
   >
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <span
         color="success"
@@ -21,7 +21,7 @@ exports[`CertStatus renders expected elements for valid props 1`] = `
       />
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
+      class="euiFlexItem emotion-euiFlexItem-growZero"
     >
       <span>
         OK  
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap
index 2d8301f19a6a1..205804fb3de95 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap
@@ -2,126 +2,102 @@
 
 exports[`MonitorTags component it shows expand tag on too many tags 1`] = `
 <div
-  class="euiBadgeGroup euiBadgeGroup--gutterExtraSmall"
+  class="euiBadgeGroup emotion-euiBadgeGroup-xs"
 >
-  <span
-    class="euiBadgeGroup__item"
+  <a
+    class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
+    href="/?filters=[[\\"tags\\",[\\"red\\"]]]"
+    rel="noreferrer"
+    style="max-width:120px"
   >
-    <a
-      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
-      href="/?filters=[[\\"tags\\",[\\"red\\"]]]"
-      rel="noreferrer"
-      style="max-width:120px"
+    <span
+      class="euiBadge__content emotion-euiBadge__content"
     >
       <span
-        class="euiBadge__content emotion-euiBadge__content"
+        class="euiBadge__text emotion-euiBadge__text-clickable"
       >
-        <span
-          class="euiBadge__text emotion-euiBadge__text-clickable"
-        >
-          red
-        </span>
+        red
       </span>
-    </a>
-  </span>
-  <span
-    class="euiBadgeGroup__item"
+    </span>
+  </a>
+  <a
+    class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
+    href="/?filters=[[\\"tags\\",[\\"green\\"]]]"
+    rel="noreferrer"
+    style="max-width:120px"
   >
-    <a
-      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
-      href="/?filters=[[\\"tags\\",[\\"green\\"]]]"
-      rel="noreferrer"
-      style="max-width:120px"
+    <span
+      class="euiBadge__content emotion-euiBadge__content"
     >
       <span
-        class="euiBadge__content emotion-euiBadge__content"
+        class="euiBadge__text emotion-euiBadge__text-clickable"
       >
-        <span
-          class="euiBadge__text emotion-euiBadge__text-clickable"
-        >
-          green
-        </span>
+        green
       </span>
-    </a>
-  </span>
-  <span
-    class="euiBadgeGroup__item"
+    </span>
+  </a>
+  <a
+    class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
+    href="/?filters=[[\\"tags\\",[\\"blue\\"]]]"
+    rel="noreferrer"
+    style="max-width:120px"
   >
-    <a
-      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
-      href="/?filters=[[\\"tags\\",[\\"blue\\"]]]"
-      rel="noreferrer"
-      style="max-width:120px"
+    <span
+      class="euiBadge__content emotion-euiBadge__content"
     >
       <span
-        class="euiBadge__content emotion-euiBadge__content"
+        class="euiBadge__text emotion-euiBadge__text-clickable"
       >
-        <span
-          class="euiBadge__text emotion-euiBadge__text-clickable"
-        >
-          blue
-        </span>
+        blue
       </span>
-    </a>
-  </span>
-  <span
-    class="euiBadgeGroup__item"
+    </span>
+  </a>
+  <a
+    class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
+    href="/?filters=[[\\"tags\\",[\\"black\\"]]]"
+    rel="noreferrer"
+    style="max-width:120px"
   >
-    <a
-      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
-      href="/?filters=[[\\"tags\\",[\\"black\\"]]]"
-      rel="noreferrer"
-      style="max-width:120px"
+    <span
+      class="euiBadge__content emotion-euiBadge__content"
     >
       <span
-        class="euiBadge__content emotion-euiBadge__content"
+        class="euiBadge__text emotion-euiBadge__text-clickable"
       >
-        <span
-          class="euiBadge__text emotion-euiBadge__text-clickable"
-        >
-          black
-        </span>
+        black
       </span>
-    </a>
-  </span>
-  <span
-    class="euiBadgeGroup__item"
+    </span>
+  </a>
+  <a
+    class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
+    href="/?filters=[[\\"tags\\",[\\"purple\\"]]]"
+    rel="noreferrer"
+    style="max-width:120px"
   >
-    <a
-      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
-      href="/?filters=[[\\"tags\\",[\\"purple\\"]]]"
-      rel="noreferrer"
-      style="max-width:120px"
+    <span
+      class="euiBadge__content emotion-euiBadge__content"
     >
       <span
-        class="euiBadge__content emotion-euiBadge__content"
+        class="euiBadge__text emotion-euiBadge__text-clickable"
       >
-        <span
-          class="euiBadge__text emotion-euiBadge__text-clickable"
-        >
-          purple
-        </span>
+        purple
       </span>
-    </a>
-  </span>
-  <span
-    class="euiBadgeGroup__item"
+    </span>
+  </a>
+  <button
+    aria-label="Click to view remaining tags"
+    class="euiBadge emotion-euiBadge-clickable-hollow"
   >
-    <button
-      aria-label="Click to view remaining tags"
-      class="euiBadge emotion-euiBadge-clickable-hollow"
+    <span
+      class="euiBadge__content emotion-euiBadge__content"
     >
       <span
-        class="euiBadge__content emotion-euiBadge__content"
+        class="euiBadge__text emotion-euiBadge__text-clickable"
       >
-        <span
-          class="euiBadge__text emotion-euiBadge__text-clickable"
-        >
-          +1
-        </span>
+        +1
       </span>
-    </button>
-  </span>
+    </span>
+  </button>
 </div>
 `;
 
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
index 9989a4d5df13a..4a23e885b8f13 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
@@ -773,10 +773,10 @@ exports[`DonutChart component renders a donut chart 1`] = `
 }
 
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+  class="euiFlexGroup emotion-euiFlexGroup-l-flexStart-center-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
     style="position:relative"
   >
     <div
@@ -801,25 +801,25 @@ exports[`DonutChart component renders a donut chart 1`] = `
     </div>
   </div>
   <div
-    class="euiFlexItem"
+    class="euiFlexItem emotion-euiFlexItem-grow-1"
   >
     <div
       class="c0"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow"
+        class="euiFlexGroup emotion-euiFlexGroup-l-flexStart-stretch-row"
       >
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c1"
+          class="euiFlexItem c1 emotion-euiFlexItem-growZero"
         >
           <div
             class="euiHealth emotion-euiHealth-s"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <span
                   color="#bd271e"
@@ -827,19 +827,19 @@ exports[`DonutChart component renders a donut chart 1`] = `
                 />
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               />
             </div>
           </div>
         </span>
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c1"
+          class="euiFlexItem c1 emotion-euiFlexItem-growZero"
           data-test-subj="xpack.synthetics.snapshot.donutChart.down.label"
         >
           Down
         </span>
         <span
-          class="euiFlexItem c2"
+          class="euiFlexItem c2 emotion-euiFlexItem-grow-1"
           data-test-subj="xpack.synthetics.snapshot.donutChart.down"
         >
           32
@@ -849,19 +849,19 @@ exports[`DonutChart component renders a donut chart 1`] = `
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow"
+        class="euiFlexGroup emotion-euiFlexGroup-l-flexStart-stretch-row"
       >
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c1"
+          class="euiFlexItem c1 emotion-euiFlexItem-growZero"
         >
           <div
             class="euiHealth emotion-euiHealth-s"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <span
                   color="#d3dae6"
@@ -869,19 +869,19 @@ exports[`DonutChart component renders a donut chart 1`] = `
                 />
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               />
             </div>
           </div>
         </span>
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c1"
+          class="euiFlexItem c1 emotion-euiFlexItem-growZero"
           data-test-subj="xpack.synthetics.snapshot.donutChart.up.label"
         >
           Up
         </span>
         <span
-          class="euiFlexItem c2"
+          class="euiFlexItem c2 emotion-euiFlexItem-grow-1"
           data-test-subj="xpack.synthetics.snapshot.donutChart.up"
         >
           95
@@ -924,10 +924,10 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
 }
 
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+  class="euiFlexGroup emotion-euiFlexGroup-l-flexStart-center-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
     style="position:relative"
   >
     <div
@@ -956,25 +956,25 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
     />
   </div>
   <div
-    class="euiFlexItem"
+    class="euiFlexItem emotion-euiFlexItem-grow-1"
   >
     <div
       class="c1"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow"
+        class="euiFlexGroup emotion-euiFlexGroup-l-flexStart-stretch-row"
       >
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c2"
+          class="euiFlexItem c2 emotion-euiFlexItem-growZero"
         >
           <div
             class="euiHealth emotion-euiHealth-s"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <span
                   color="#bd271e"
@@ -982,19 +982,19 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
                 />
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               />
             </div>
           </div>
         </span>
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c2"
+          class="euiFlexItem c2 emotion-euiFlexItem-growZero"
           data-test-subj="xpack.synthetics.snapshot.donutChart.down.label"
         >
           Down
         </span>
         <span
-          class="euiFlexItem c3"
+          class="euiFlexItem c3 emotion-euiFlexItem-grow-1"
           data-test-subj="xpack.synthetics.snapshot.donutChart.down"
         >
           0
@@ -1004,19 +1004,19 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
         class="euiSpacer euiSpacer--m emotion-euiSpacer-m"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow"
+        class="euiFlexGroup emotion-euiFlexGroup-l-flexStart-stretch-row"
       >
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c2"
+          class="euiFlexItem c2 emotion-euiFlexItem-growZero"
         >
           <div
             class="euiHealth emotion-euiHealth-s"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+              class="euiFlexGroup emotion-euiFlexGroup-xs-flexStart-center-row"
             >
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               >
                 <span
                   color="#d3dae6"
@@ -1024,19 +1024,19 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
                 />
               </div>
               <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
+                class="euiFlexItem emotion-euiFlexItem-growZero"
               />
             </div>
           </div>
         </span>
         <span
-          class="euiFlexItem euiFlexItem--flexGrowZero c2"
+          class="euiFlexItem c2 emotion-euiFlexItem-growZero"
           data-test-subj="xpack.synthetics.snapshot.donutChart.up.label"
         >
           Up
         </span>
         <span
-          class="euiFlexItem c3"
+          class="euiFlexItem c3 emotion-euiFlexItem-grow-1"
           data-test-subj="xpack.synthetics.snapshot.donutChart.up"
         >
           95
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
index fc5f32de99a2e..e59a8eb44f547 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`ML Integrations renders without errors 1`] = `
   >
     <button
       aria-label="You can enable anomaly detection job or if job is already there you can manage the job or alert."
-      class="euiButton emotion-euiButtonDisplay-s-isDisabled-s-base-disabled"
+      class="euiButton emotion-euiButtonDisplay-s-defaultMinWidth-isDisabled-s-base-disabled"
       data-test-subj="uptimeEnableAnomalyBtn"
       disabled=""
       type="button"
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
index dfc908c079d09..5be2524c6ebce 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
@@ -134,10 +134,10 @@ exports[`PingListExpandedRow renders expected elements for valid props 1`] = `
 
 exports[`PingListExpandedRow renders link to docs if body is not recorded but it is present 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-l-flexStart-stretch-column"
 >
   <div
-    class="euiFlexItem"
+    class="euiFlexItem emotion-euiFlexItem-grow-1"
   >
     <div
       class="euiPanel euiPanel--primary euiPanel--paddingMedium euiCallOut euiCallOut--primary emotion-euiPanel-none-m-primary-euiCallOut"
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap
index e74445fc3e7e8..8bdfe9e9b28eb 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/monitor_expressions/__snapshots__/time_expression_select.test.tsx.snap
@@ -2,10 +2,10 @@
 
 exports[`TimeExpressionSelect component should renders against props 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup emotion-euiFlexGroup-responsive-s-flexStart-stretch-row"
 >
   <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
+    class="euiFlexItem emotion-euiFlexItem-growZero"
   >
     <div
       class="euiPopover emotion-euiPopover"
@@ -35,7 +35,7 @@ exports[`TimeExpressionSelect component should renders against props 1`] = `
     </div>
   </div>
   <div
-    class="euiFlexItem"
+    class="euiFlexItem emotion-euiFlexItem-grow-1"
   >
     <div
       class="euiPopover emotion-euiPopover"
diff --git a/x-pack/plugins/threat_intelligence/cypress/screens/indicators.ts b/x-pack/plugins/threat_intelligence/cypress/screens/indicators.ts
index 6a8f723d22ece..94eb2e46c350e 100644
--- a/x-pack/plugins/threat_intelligence/cypress/screens/indicators.ts
+++ b/x-pack/plugins/threat_intelligence/cypress/screens/indicators.ts
@@ -37,7 +37,7 @@ export const INDICATORS_TABLE_FIRST_SEEN_COLUMN_HEADER = `[data-test-subj="dataG
 
 export const INDICATORS_TABLE_LAST_SEEN_COLUMN_HEADER = `[data-test-subj="dataGridHeaderCell-threat.indicator.last_seen"]`;
 
-export const TABLE_CONTROLS = '[data-test-sub="dataGridControls"]';
+export const TABLE_CONTROLS = '[data-test-subj="dataGridControls"]';
 
 export const INDICATOR_TYPE_CELL =
   '[role="gridcell"][data-gridcell-column-id="threat.indicator.type"]';
diff --git a/x-pack/plugins/threat_intelligence/public/components/update_status/update_status.test.tsx b/x-pack/plugins/threat_intelligence/public/components/update_status/update_status.test.tsx
index 2ed1503d89a78..c9b191a4d15e8 100644
--- a/x-pack/plugins/threat_intelligence/public/components/update_status/update_status.test.tsx
+++ b/x-pack/plugins/threat_intelligence/public/components/update_status/update_status.test.tsx
@@ -19,10 +19,10 @@ describe('<UpdateStatus />', () => {
     expect(result.asFragment()).toMatchInlineSnapshot(`
       <DocumentFragment>
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
               class="euiText emotion-euiText-xs-euiTextColor-subdued"
@@ -44,10 +44,10 @@ describe('<UpdateStatus />', () => {
     expect(result.asFragment()).toMatchInlineSnapshot(`
       <DocumentFragment>
         <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+          class="euiFlexGroup emotion-euiFlexGroup-responsive-l-flexStart-stretch-row"
         >
           <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
+            class="euiFlexItem emotion-euiFlexItem-growZero"
           >
             <div
               class="euiText emotion-euiText-xs-euiTextColor-subdued"
diff --git a/x-pack/plugins/threat_intelligence/public/containers/integrations_guard/__snapshots__/integrations_guard.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/containers/integrations_guard/__snapshots__/integrations_guard.test.tsx.snap
index f9b8c865dc316..16c65aa86117b 100644
--- a/x-pack/plugins/threat_intelligence/public/containers/integrations_guard/__snapshots__/integrations_guard.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/containers/integrations_guard/__snapshots__/integrations_guard.test.tsx.snap
@@ -74,7 +74,7 @@ exports[`IntegrationsGuard should render empty page when no indicators are found
             class="euiSpacer euiSpacer--l emotion-euiSpacer-l"
           />
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-fill-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-fill-primary"
             data-test-subj="tiEmptyPageIntegrationsPageLink"
             type="button"
           >
diff --git a/x-pack/plugins/threat_intelligence/public/modules/cases/components/attachment_children/flyout/__snapshots__/flyout.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/cases/components/attachment_children/flyout/__snapshots__/flyout.test.tsx.snap
index d8da6e4afe13c..837e10a15a485 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/cases/components/attachment_children/flyout/__snapshots__/flyout.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/cases/components/attachment_children/flyout/__snapshots__/flyout.test.tsx.snap
@@ -45,7 +45,7 @@ Object {
           class="euiFlyoutBody emotion-euiFlyoutBody"
         >
           <div
-            class="euiFlyoutBody__overflow css-1fk8opf-noBanner"
+            class="euiFlyoutBody__overflow css-18yrfj9-noBanner"
             tabindex="0"
           >
             <div
@@ -119,7 +119,7 @@ Object {
         class="euiFlyoutBody emotion-euiFlyoutBody"
       >
         <div
-          class="euiFlyoutBody__overflow css-1fk8opf-noBanner"
+          class="euiFlyoutBody__overflow css-18yrfj9-noBanner"
           tabindex="0"
         >
           <div
diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap
index f7ae645c3b1d9..91ca6c96a9f33 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap
@@ -6,10 +6,10 @@ exports[`<IndicatorsBarChartWrapper /> when not loading or refetching should ren
     style="position: relative;"
   >
     <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+      class="euiFlexGroup emotion-euiFlexGroup-responsive-l-spaceBetween-stretch-row"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <h2
           class="euiTitle emotion-euiTitle-s"
@@ -18,7 +18,7 @@ exports[`<IndicatorsBarChartWrapper /> when not loading or refetching should ren
         </h2>
       </div>
       <div
-        class="euiFlexItem euiFlexItem--flexGrowZero"
+        class="euiFlexItem emotion-euiFlexItem-growZero"
       >
         <div
           class="euiComboBox euiComboBox--prepended css-18y0wn9"
diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/take_action/__snapshots__/take_action.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/take_action/__snapshots__/take_action.test.tsx.snap
index 441196d38acde..66def03938ee4 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/take_action/__snapshots__/take_action.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/take_action/__snapshots__/take_action.test.tsx.snap
@@ -14,7 +14,7 @@ Object {
           class="euiPopover__anchor css-16vtueo-render"
         >
           <button
-            class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+            class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
             type="button"
           >
             <span
@@ -41,7 +41,7 @@ Object {
         class="euiPopover__anchor css-16vtueo-render"
       >
         <button
-          class="euiButton emotion-euiButtonDisplay-m-m-base-primary"
+          class="euiButton emotion-euiButtonDisplay-m-defaultMinWidth-m-base-primary"
           type="button"
         >
           <span
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/__snapshots__/filter_in.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/__snapshots__/filter_in.test.tsx.snap
index 373bf4cc54c38..07c863c197742 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/__snapshots__/filter_in.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/__snapshots__/filter_in.test.tsx.snap
@@ -131,7 +131,7 @@ Object {
         class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <button
             class="euiButtonIcon euiButtonIcon--xSmall emotion-euiButtonIcon-empty-primary-hoverStyles"
@@ -153,7 +153,7 @@ Object {
       class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <button
           class="euiButtonIcon euiButtonIcon--xSmall emotion-euiButtonIcon-empty-primary-hoverStyles"
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/__snapshots__/filter_out.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/__snapshots__/filter_out.test.tsx.snap
index 59dcb496df97e..c7bc1f033f075 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/__snapshots__/filter_out.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/__snapshots__/filter_out.test.tsx.snap
@@ -131,7 +131,7 @@ Object {
         class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <button
             class="euiButtonIcon euiButtonIcon--xSmall emotion-euiButtonIcon-empty-primary-hoverStyles"
@@ -153,7 +153,7 @@ Object {
       class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <button
           class="euiButtonIcon euiButtonIcon--xSmall emotion-euiButtonIcon-empty-primary-hoverStyles"
diff --git a/x-pack/plugins/threat_intelligence/public/modules/timeline/components/add_to_timeline/__snapshots__/add_to_timeline.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/timeline/components/add_to_timeline/__snapshots__/add_to_timeline.test.tsx.snap
index 4b66eab39f26d..a6ca8e4c2e1dc 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/timeline/components/add_to_timeline/__snapshots__/add_to_timeline.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/timeline/components/add_to_timeline/__snapshots__/add_to_timeline.test.tsx.snap
@@ -253,7 +253,7 @@ Object {
         class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <span
             data-test-subj="test-add-to-timeline"
@@ -269,7 +269,7 @@ Object {
       class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <span
           data-test-subj="test-add-to-timeline"
@@ -342,7 +342,7 @@ Object {
         class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <div
-          class="euiFlexItem"
+          class="euiFlexItem emotion-euiFlexItem-grow-1"
         >
           <span
             data-test-subj="test-add-to-timeline"
@@ -358,7 +358,7 @@ Object {
       class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <div
-        class="euiFlexItem"
+        class="euiFlexItem emotion-euiFlexItem-grow-1"
       >
         <span
           data-test-subj="test-add-to-timeline"
diff --git a/x-pack/plugins/timelines/public/components/inspect/modal.test.tsx b/x-pack/plugins/timelines/public/components/inspect/modal.test.tsx
index f3846cd784ccc..1404dc583ef19 100644
--- a/x-pack/plugins/timelines/public/components/inspect/modal.test.tsx
+++ b/x-pack/plugins/timelines/public/components/inspect/modal.test.tsx
@@ -105,7 +105,7 @@ describe('Modal Inspect', () => {
         </ThemeProvider>
       );
 
-      wrapper.find('.euiTab').first().simulate('click');
+      wrapper.find('button.euiTab').first().simulate('click');
       wrapper.update();
 
       expect(
@@ -144,7 +144,7 @@ describe('Modal Inspect', () => {
         </ThemeProvider>
       );
 
-      wrapper.find('.euiTab').at(2).simulate('click');
+      wrapper.find('button.euiTab').at(2).simulate('click');
       wrapper.update();
 
       expect(JSON.parse(wrapper.find('EuiCodeBlock').first().text())).toEqual({
@@ -211,7 +211,7 @@ describe('Modal Inspect', () => {
         </ThemeProvider>
       );
 
-      wrapper.find('.euiTab').at(1).simulate('click');
+      wrapper.find('button.euiTab').at(1).simulate('click');
       wrapper.update();
 
       expect(JSON.parse(wrapper.find('EuiCodeBlock').first().text())).toEqual({
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap b/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap
index 76cef605d5b02..f7b4e836ee784 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`Transform: Aggregation <PopoverForm /> Minimal initialization 1`] = `
     describedByIds={Array []}
     display="row"
     error={false}
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={false}
     helpText=""
@@ -31,7 +30,6 @@ exports[`Transform: Aggregation <PopoverForm /> Minimal initialization 1`] = `
   <EuiFormRow
     describedByIds={Array []}
     display="row"
-    fullWidth={false}
     hasChildLabel={true}
     hasEmptyLabelSpace={true}
     labelType="label"
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index d2a97e17a5882..aac5833d5c8f6 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -543,9 +543,9 @@
     "core.euiCardSelect.select": "Sélectionner",
     "core.euiCardSelect.selected": "Sélectionné",
     "core.euiCardSelect.unavailable": "Indisponible",
-    "core.euiCodeBlock.copyButton": "Copier",
-    "core.euiCodeBlock.fullscreenCollapse": "Réduire",
-    "core.euiCodeBlock.fullscreenExpand": "Développer",
+    "core.euiCodeBlockCopy.copy": "Copier",
+    "core.euiCodeBlockFullScreen.fullscreenCollapse": "Réduire",
+    "core.euiCodeBlockFullScreen.fullscreenExpand": "Développer",
     "core.euiCollapsedItemActions.allActions": "Toutes les actions",
     "core.euiColorPicker.alphaLabel": "Valeur (opacité) du canal Alpha",
     "core.euiColorPicker.closeLabel": "Appuyez sur la flèche du bas pour ouvrir la fenêtre contextuelle des options de couleur.",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 5ad47b09d93de..17a8f65ba1b52 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -541,9 +541,9 @@
     "core.euiCardSelect.select": "選択してください",
     "core.euiCardSelect.selected": "利用不可",
     "core.euiCardSelect.unavailable": "選択済み",
-    "core.euiCodeBlock.copyButton": "コピー",
-    "core.euiCodeBlock.fullscreenCollapse": "縮小",
-    "core.euiCodeBlock.fullscreenExpand": "拡張",
+    "core.euiCodeBlockCopy.copy": "コピー",
+    "core.euiCodeBlockFullScreen.fullscreenCollapse": "縮小",
+    "core.euiCodeBlockFullScreen.fullscreenExpand": "拡張",
     "core.euiCollapsedItemActions.allActions": "すべてのアクション",
     "core.euiColorPicker.alphaLabel": "アルファチャネル（不透明）値",
     "core.euiColorPicker.closeLabel": "下矢印キーを押すと、色オプションを含むポップオーバーが開きます",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index ea64b3b043ab0..3161deee62372 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -543,9 +543,9 @@
     "core.euiCardSelect.select": "选择",
     "core.euiCardSelect.selected": "已选定",
     "core.euiCardSelect.unavailable": "不可用",
-    "core.euiCodeBlock.copyButton": "复制",
-    "core.euiCodeBlock.fullscreenCollapse": "折叠",
-    "core.euiCodeBlock.fullscreenExpand": "展开",
+    "core.euiCodeBlockCopy.copy": "复制",
+    "core.euiCodeBlockFullScreen.fullscreenCollapse": "折叠",
+    "core.euiCodeBlockFullScreen.fullscreenExpand": "展开",
     "core.euiCollapsedItemActions.allActions": "所有操作",
     "core.euiColorPicker.alphaLabel": "Alpha 通道（不透明度）值",
     "core.euiColorPicker.closeLabel": "按向下箭头键可打开包含颜色选项的弹出框",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/home.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/home.test.tsx
index 83c856663f8f8..b976f87a5b5ff 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/home.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/home.test.tsx
@@ -70,7 +70,7 @@ describe('home', () => {
     let home = mountWithIntl(<TriggersActionsUIHome {...props} />);
 
     // Just rules/logs
-    expect(home.find('.euiTab__content').length).toBe(2);
+    expect(home.find('span.euiTab__content').length).toBe(2);
 
     (getIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
       if (feature === 'internalAlertsTable') {
@@ -81,6 +81,6 @@ describe('home', () => {
 
     home = mountWithIntl(<TriggersActionsUIHome {...props} />);
     // alerts now too!
-    expect(home.find('.euiTab__content').length).toBe(3);
+    expect(home.find('span.euiTab__content').length).toBe(3);
   });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
index 2a8f106bf1d99..ce9e4e638b573 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -284,7 +284,7 @@ describe('actions_connectors_list', () => {
 
     it('renders table with preconfigured connectors', async () => {
       await setup();
-      expect(wrapper.find('[data-test-subj="preConfiguredTitleMessage"]')).toHaveLength(2);
+      expect(wrapper.find('span[data-test-subj="preConfiguredTitleMessage"]')).toHaveLength(1);
     });
 
     it('renders unknown connector type as disabled', async () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.test.tsx
index c4bbc7e720500..e79959bd6ae49 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.test.tsx
@@ -34,7 +34,7 @@ describe('rule_event_log_list_status_filter', () => {
     expect(wrapper.find(EuiFilterSelectItem).exists()).toBeFalsy();
     expect(wrapper.find(EuiFilterButton).exists()).toBeTruthy();
 
-    expect(wrapper.find('.euiNotificationBadge').text()).toEqual('0');
+    expect(wrapper.find('.euiNotificationBadge').last().text()).toEqual('0');
   });
 
   it('can open the popover correctly', () => {
@@ -54,7 +54,7 @@ describe('rule_event_log_list_status_filter', () => {
       selectedOptions: ['success'],
     });
 
-    expect(wrapper.find('.euiNotificationBadge').text()).toEqual('1');
+    expect(wrapper.find('.euiNotificationBadge').last().text()).toEqual('1');
 
     statusItems.at(1).simulate('click');
     expect(onChangeMock).toHaveBeenCalledWith(['success', 'failure']);
@@ -63,7 +63,7 @@ describe('rule_event_log_list_status_filter', () => {
       selectedOptions: ['success', 'failure'],
     });
 
-    expect(wrapper.find('.euiNotificationBadge').text()).toEqual('2');
+    expect(wrapper.find('.euiNotificationBadge').last().text()).toEqual('2');
 
     statusItems.at(0).simulate('click');
     expect(onChangeMock).toHaveBeenCalledWith(['failure']);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.test.tsx
index a7d3bdfb8e2e0..27eddb21177cd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.test.tsx
@@ -25,7 +25,7 @@ describe('RuleStatusFilter', () => {
     expect(wrapper.find(EuiSelectableListItem).exists()).toBeFalsy();
     expect(wrapper.find(EuiFilterButton).exists()).toBeTruthy();
 
-    expect(wrapper.find('.euiNotificationBadge').text()).toEqual('0');
+    expect(wrapper.find('.euiNotificationBadge').last().text()).toEqual('0');
   });
 
   it('can open the popover correctly', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_filter.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_filter.test.tsx
index 1dc7ef1dc8135..9729e6694bea4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_filter.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_filter.test.tsx
@@ -25,7 +25,7 @@ describe('rule_tag_filter', () => {
     );
 
     expect(wrapper.find(EuiFilterButton).exists()).toBeTruthy();
-    expect(wrapper.find('.euiNotificationBadge').text()).toEqual('0');
+    expect(wrapper.find('.euiNotificationBadge').last().text()).toEqual('0');
   });
 
   it('can open the popover correctly', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.test.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.test.tsx
index 116e548e78efc..20171575923ed 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/value.test.tsx
@@ -35,7 +35,6 @@ describe('value expression', () => {
       describedByIds={Array []}
       display="row"
       error={Array []}
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={false}
@@ -71,7 +70,6 @@ describe('value expression', () => {
           "value is not valid",
         ]
       }
-      fullWidth={false}
       hasChildLabel={true}
       hasEmptyLabelSpace={false}
       isInvalid={true}
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 2d200279f6fb9..495135c1ece5c 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -1061,7 +1061,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
         );
       } else {
         buttonEl = await find.byCssSelector(
-          `[data-test-subj^="dataGridHeaderCellActionGroup"] li[class$="selected"] [title^="Sort"]`
+          `[data-test-subj^="dataGridHeaderCellActionGroup"] li[class*="selected"] [title^="Sort"]`
         );
       }
       return buttonEl.click();
diff --git a/yarn.lock b/yarn.lock
index f11a37b91fe54..1348827b2539c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1527,10 +1527,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@67.1.8":
-  version "67.1.8"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-67.1.8.tgz#4b2adbc0abaf05ac10d72ebf170f62f24a34c538"
-  integrity sha512-dlx1OseKn1PRgZtrzsVeiswdviKEHENkpJaFSFuv3pZGSVxr+bKipDDBSB6DR6jVi4fuwWTcnlT5Dz7RoRILRA==
+"@elastic/eui@70.2.4":
+  version "70.2.4"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-70.2.4.tgz#341be8be182e2d96980de771d3fc0f2a43757e9f"
+  integrity sha512-rtjeJJCz7XGtuRP30kK6TZti6o5wmwA1BHQuStTH8mFmTIdUnfRgFaI1AJvbLwckgj4JuVkdfAYBUxqyC9V8UA==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"