diff --git a/package.json b/package.json
index 2e5a06cc76665..43c439a541ebf 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@babel/register": "^7.5.5",
     "@elastic/charts": "^11.1.1",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
diff --git a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
index c6912764db2af..197516205cbe9 100644
--- a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
+++ b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
@@ -24,10 +24,7 @@ exports[`rendering render matches snapshot 1`] = `
               color="primary"
               data-test-subj="clearSession"
               fill={true}
-              iconSide="left"
               onClick={[Function]}
-              size="m"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Clear your session"
@@ -36,11 +33,8 @@ exports[`rendering render matches snapshot 1`] = `
               />
             </EuiButton>,
             <EuiButtonEmpty
-              color="primary"
               data-test-subj="goBack"
-              iconSide="left"
               onClick={[Function]}
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Go back"
diff --git a/src/core/public/notifications/toasts/__snapshots__/error_toast.test.tsx.snap b/src/core/public/notifications/toasts/__snapshots__/error_toast.test.tsx.snap
index 22af4cebcf387..5723039a43e20 100644
--- a/src/core/public/notifications/toasts/__snapshots__/error_toast.test.tsx.snap
+++ b/src/core/public/notifications/toasts/__snapshots__/error_toast.test.tsx.snap
@@ -12,11 +12,8 @@ exports[`renders matching snapshot 1`] = `
   >
     <EuiButton
       color="danger"
-      fill={false}
-      iconSide="left"
       onClick={[Function]}
       size="s"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="See the full error"
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/language_switcher.test.tsx.snap b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/language_switcher.test.tsx.snap
index c3624e3ba6714..e46ec946e97f6 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/language_switcher.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/language_switcher.test.tsx.snap
@@ -5,11 +5,8 @@ exports[`LanguageSwitcher should toggle off if language is lucene 1`] = `
   anchorPosition="downRight"
   button={
     <EuiButtonEmpty
-      color="primary"
-      iconSide="left"
       onClick={[Function]}
       size="xs"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Lucene"
@@ -108,11 +105,8 @@ exports[`LanguageSwitcher should toggle on if language is kuery 1`] = `
   anchorPosition="downRight"
   button={
     <EuiButtonEmpty
-      color="primary"
-      iconSide="left"
       onClick={[Function]}
       size="xs"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="KQL"
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
index ea93d2c096cb5..ccf2d9b2ce54a 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
@@ -299,11 +299,8 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
                     anchorPosition="downRight"
                     button={
                       <EuiButtonEmpty
-                        color="primary"
-                        iconSide="left"
                         onClick={[Function]}
                         size="xs"
-                        type="button"
                       >
                         <FormattedMessage
                           defaultMessage="KQL"
@@ -339,11 +336,8 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
                           className="euiPopover__anchor"
                         >
                           <EuiButtonEmpty
-                            color="primary"
-                            iconSide="left"
                             onClick={[Function]}
                             size="xs"
-                            type="button"
                           >
                             <button
                               className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
@@ -688,11 +682,8 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
                     anchorPosition="downRight"
                     button={
                       <EuiButtonEmpty
-                        color="primary"
-                        iconSide="left"
                         onClick={[Function]}
                         size="xs"
-                        type="button"
                       >
                         <FormattedMessage
                           defaultMessage="Lucene"
@@ -728,11 +719,8 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
                           className="euiPopover__anchor"
                         >
                           <EuiButtonEmpty
-                            color="primary"
-                            iconSide="left"
                             onClick={[Function]}
                             size="xs"
-                            type="button"
                           >
                             <button
                               className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
@@ -1077,11 +1065,8 @@ exports[`QueryBarInput Should render the given query 1`] = `
                     anchorPosition="downRight"
                     button={
                       <EuiButtonEmpty
-                        color="primary"
-                        iconSide="left"
                         onClick={[Function]}
                         size="xs"
-                        type="button"
                       >
                         <FormattedMessage
                           defaultMessage="KQL"
@@ -1117,11 +1102,8 @@ exports[`QueryBarInput Should render the given query 1`] = `
                           className="euiPopover__anchor"
                         >
                           <EuiButtonEmpty
-                            color="primary"
-                            iconSide="left"
                             onClick={[Function]}
                             size="xs"
-                            type="button"
                           >
                             <button
                               className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.js.snap
index ddd7ce2430f59..bf48d6959ff9e 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.js.snap
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.js.snap
@@ -73,8 +73,6 @@ exports[`renders ControlsTab 1`] = `
   />
   <EuiPanel
     grow={false}
-    hasShadow={false}
-    paddingSize="m"
   >
     <EuiFlexGroup>
       <EuiFlexItem>
@@ -121,14 +119,10 @@ exports[`renders ControlsTab 1`] = `
         >
           <EuiButton
             aria-label="Add control"
-            color="primary"
             data-test-subj="inputControlEditorAddBtn"
             fill={true}
-            iconSide="left"
             iconType="plusInCircle"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add"
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
index 287670e43c864..841421474e7b1 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
@@ -42,14 +42,10 @@ exports[`Apply and Cancel change btns enabled when there are changes 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         data-test-subj="inputControlSubmitBtn"
         disabled={false}
         fill={true}
-        iconSide="left"
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Apply changes"
@@ -62,12 +58,9 @@ exports[`Apply and Cancel change btns enabled when there are changes 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlCancelBtn"
         disabled={false}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel changes"
@@ -80,12 +73,9 @@ exports[`Apply and Cancel change btns enabled when there are changes 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlClearBtn"
         disabled={true}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Clear form"
@@ -140,14 +130,10 @@ exports[`Clear btns enabled when there are values 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         data-test-subj="inputControlSubmitBtn"
         disabled={true}
         fill={true}
-        iconSide="left"
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Apply changes"
@@ -160,12 +146,9 @@ exports[`Clear btns enabled when there are values 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlCancelBtn"
         disabled={true}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel changes"
@@ -178,12 +161,9 @@ exports[`Clear btns enabled when there are values 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlClearBtn"
         disabled={false}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Clear form"
@@ -238,14 +218,10 @@ exports[`Renders list control 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         data-test-subj="inputControlSubmitBtn"
         disabled={true}
         fill={true}
-        iconSide="left"
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Apply changes"
@@ -258,12 +234,9 @@ exports[`Renders list control 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlCancelBtn"
         disabled={true}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel changes"
@@ -276,12 +249,9 @@ exports[`Renders list control 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlClearBtn"
         disabled={true}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Clear form"
@@ -342,14 +312,10 @@ exports[`Renders range control 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         data-test-subj="inputControlSubmitBtn"
         disabled={true}
         fill={true}
-        iconSide="left"
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Apply changes"
@@ -362,12 +328,9 @@ exports[`Renders range control 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlCancelBtn"
         disabled={true}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel changes"
@@ -380,12 +343,9 @@ exports[`Renders range control 1`] = `
       grow={false}
     >
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="inputControlClearBtn"
         disabled={true}
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Clear form"
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap b/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
index ce81f5f2e6130..9b819443808c9 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
@@ -62,14 +62,10 @@ exports[`after fetch initialFilter 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
-            color="primary"
             data-test-subj="createDashboardPromptButton"
             fill={true}
-            iconSide="left"
             iconType="plusInCircle"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Create new dashboard"
@@ -159,14 +155,10 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
-            color="primary"
             data-test-subj="createDashboardPromptButton"
             fill={true}
-            iconSide="left"
             iconType="plusInCircle"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Create new dashboard"
@@ -256,14 +248,10 @@ exports[`after fetch renders table rows 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
-            color="primary"
             data-test-subj="createDashboardPromptButton"
             fill={true}
-            iconSide="left"
             iconType="plusInCircle"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Create new dashboard"
@@ -353,14 +341,10 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
-            color="primary"
             data-test-subj="createDashboardPromptButton"
             fill={true}
-            iconSide="left"
             iconType="plusInCircle"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Create new dashboard"
@@ -450,14 +434,10 @@ exports[`renders empty page in before initial fetch to avoid flickering 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
-            color="primary"
             data-test-subj="createDashboardPromptButton"
             fill={true}
-            iconSide="left"
             iconType="plusInCircle"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Create new dashboard"
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap b/src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap
index 213a949f7358f..6def1b1a198b8 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap
@@ -41,11 +41,8 @@ exports[`renders DashboardCloneModal 1`] = `
     </EuiModalBody>
     <EuiModalFooter>
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="cloneCancelButton"
-        iconSide="left"
         onClick={[Function]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel"
@@ -54,14 +51,10 @@ exports[`renders DashboardCloneModal 1`] = `
         />
       </EuiButtonEmpty>
       <EuiButton
-        color="primary"
         data-test-subj="cloneConfirmButton"
         fill={true}
-        iconSide="left"
         isLoading={false}
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Confirm Clone"
diff --git a/src/legacy/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap b/src/legacy/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap
index 8e100fb250db2..cc53e4bdcdcf9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap
@@ -54,13 +54,9 @@ exports[`render 1`] = `
         grow={false}
       >
         <EuiButton
-          color="primary"
           fill={true}
           href="#/management/kibana/objects?_a=(tab:search)"
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Manage searches"
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap
index 2ef87889cb6c8..fde7aba8ac965 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap
@@ -2,8 +2,6 @@
 
 exports[`apmUiEnabled 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <EuiFlexGroup>
@@ -54,12 +52,7 @@ exports[`apmUiEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addAmpButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial/apm"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add APM"
@@ -96,12 +89,7 @@ exports[`apmUiEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addLogDataButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/logging"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add log data"
@@ -138,12 +126,7 @@ exports[`apmUiEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addMetricsButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/metrics"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add metric data"
@@ -180,12 +163,7 @@ exports[`apmUiEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addSiemButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/siem"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add security events"
@@ -293,8 +271,6 @@ exports[`apmUiEnabled 1`] = `
 
 exports[`isNewKibanaInstance 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <EuiFlexGroup>
@@ -345,12 +321,7 @@ exports[`isNewKibanaInstance 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addLogDataButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/logging"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add log data"
@@ -387,12 +358,7 @@ exports[`isNewKibanaInstance 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addMetricsButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/metrics"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add metric data"
@@ -429,12 +395,7 @@ exports[`isNewKibanaInstance 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addSiemButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/siem"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add security events"
@@ -542,8 +503,6 @@ exports[`isNewKibanaInstance 1`] = `
 
 exports[`mlEnabled 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <EuiFlexGroup>
@@ -594,12 +553,7 @@ exports[`mlEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addAmpButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial/apm"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add APM"
@@ -636,12 +590,7 @@ exports[`mlEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addLogDataButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/logging"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add log data"
@@ -678,12 +627,7 @@ exports[`mlEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addMetricsButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/metrics"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add metric data"
@@ -720,12 +664,7 @@ exports[`mlEnabled 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addSiemButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/siem"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add security events"
@@ -871,8 +810,6 @@ exports[`mlEnabled 1`] = `
 
 exports[`render 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <EuiFlexGroup>
@@ -923,12 +860,7 @@ exports[`render 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addLogDataButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/logging"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add log data"
@@ -965,12 +897,7 @@ exports[`render 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addMetricsButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/metrics"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add metric data"
@@ -1007,12 +934,7 @@ exports[`render 1`] = `
           <EuiButton
             aria-describedby="aria-describedby.addSiemButtonLabel"
             className="homAddData__button"
-            color="primary"
-            fill={false}
             href="#/home/tutorial_directory/siem"
-            iconSide="left"
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Add security events"
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
index 0e73c0cbc93a5..4839dfbd0ea3f 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
@@ -28,8 +28,6 @@ exports[`home directories should not render directory entry when showOnHomePage
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -54,8 +52,6 @@ exports[`home directories should not render directory entry when showOnHomePage
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -104,12 +100,7 @@ exports[`home directories should not render directory entry when showOnHomePage
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -151,8 +142,6 @@ exports[`home directories should render ADMIN directory entry in "Manage" panel
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -177,8 +166,6 @@ exports[`home directories should render ADMIN directory entry in "Manage" panel
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -240,12 +227,7 @@ exports[`home directories should render ADMIN directory entry in "Manage" panel
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -287,8 +269,6 @@ exports[`home directories should render DATA directory entry in "Explore Data" p
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -326,8 +306,6 @@ exports[`home directories should render DATA directory entry in "Explore Data" p
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -376,12 +354,7 @@ exports[`home directories should render DATA directory entry in "Explore Data" p
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -423,8 +396,6 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -449,8 +420,6 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -499,12 +468,7 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -546,8 +510,6 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -572,8 +534,6 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -622,12 +582,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -669,8 +624,6 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -695,8 +648,6 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -745,12 +696,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -792,8 +738,6 @@ exports[`home should render home component 1`] = `
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -818,8 +762,6 @@ exports[`home should render home component 1`] = `
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -868,12 +810,7 @@ exports[`home should render home component 1`] = `
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -915,8 +852,6 @@ exports[`home welcome should show the normal home page if loading fails 1`] = `
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -941,8 +876,6 @@ exports[`home welcome should show the normal home page if loading fails 1`] = `
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -991,12 +924,7 @@ exports[`home welcome should show the normal home page if loading fails 1`] = `
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -1038,8 +966,6 @@ exports[`home welcome should show the normal home page if welcome screen is disa
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -1064,8 +990,6 @@ exports[`home welcome should show the normal home page if welcome screen is disa
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -1114,12 +1038,7 @@ exports[`home welcome should show the normal home page if welcome screen is disa
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
@@ -1171,8 +1090,6 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = `
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -1197,8 +1114,6 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = `
       </EuiFlexItem>
       <EuiFlexItem>
         <EuiPanel
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <EuiTitle
@@ -1247,12 +1162,7 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = `
           size="s"
         />
         <EuiButton
-          color="primary"
-          fill={false}
           href="#/home/feature_directory"
-          iconSide="left"
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="View full directory of Kibana plugins"
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap
index 474ddedba6233..1a38c494cf5e2 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap
@@ -2,8 +2,6 @@
 
 exports[`render 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <EuiTitle
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap
index ddc87874ec787..e08d802406fff 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap
@@ -6,13 +6,9 @@ exports[`should render popover when appLinks is not empty 1`] = `
   button={
     <EuiButton
       aria-label="View Sample eCommerce orders"
-      color="primary"
-      fill={false}
       iconSide="right"
       iconType="arrowDown"
       onClick={[Function]}
-      size="m"
-      type="button"
     >
       View data
     </EuiButton>
@@ -59,13 +55,8 @@ exports[`should render popover when appLinks is not empty 1`] = `
 exports[`should render simple button when appLinks is empty 1`] = `
 <EuiButton
   aria-label="View Sample eCommerce orders"
-  color="primary"
   data-test-subj="launchSampleDataSetecommerce"
-  fill={false}
   href="root/app/kibana#/dashboard/722b74f0-b882-11e8-a6d9-e546fe2bba5f"
-  iconSide="left"
-  size="m"
-  type="button"
 >
   View data
 </EuiButton>
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap
index 7d4cba8a2d5a7..9fd3eebe96d8c 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap
@@ -24,12 +24,8 @@ exports[`render 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         fill={true}
         href="/app/myapp"
-        iconSide="left"
-        size="m"
-        type="button"
       >
         launch myapp
       </EuiButton>
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap
index 6004cde57773b..48685057317f9 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap
@@ -28,7 +28,6 @@ exports[`render 1`] = `
     size="m"
   >
     <EuiTab
-      disabled={false}
       isSelected={true}
       key="0"
       onClick={[Function]}
@@ -36,7 +35,6 @@ exports[`render 1`] = `
       OSX
     </EuiTab>
     <EuiTab
-      disabled={false}
       isSelected={false}
       key="1"
       onClick={[Function]}
@@ -111,7 +109,6 @@ exports[`statusCheckState checking status 1`] = `
     size="m"
   >
     <EuiTab
-      disabled={false}
       isSelected={true}
       key="0"
       onClick={[Function]}
@@ -119,7 +116,6 @@ exports[`statusCheckState checking status 1`] = `
       OSX
     </EuiTab>
     <EuiTab
-      disabled={false}
       isSelected={false}
       key="1"
       onClick={[Function]}
@@ -162,7 +158,7 @@ exports[`statusCheckState checking status 1`] = `
         },
         Object {
           "children": <React.Fragment>
-            <EuiFlexGroup
+            <ForwardRef
               alignItems="center"
               justifyContent="spaceBetween"
             >
@@ -175,18 +171,13 @@ exports[`statusCheckState checking status 1`] = `
                 grow={false}
               >
                 <EuiButton
-                  color="primary"
-                  fill={false}
-                  iconSide="left"
                   isLoading={true}
                   onClick={[Function]}
-                  size="m"
-                  type="button"
                 >
                   custom btn label
                 </EuiButton>
               </EuiFlexItem>
-            </EuiFlexGroup>
+            </ForwardRef>
             <EuiSpacer
               size="s"
             />
@@ -229,7 +220,6 @@ exports[`statusCheckState failed status check - error 1`] = `
     size="m"
   >
     <EuiTab
-      disabled={false}
       isSelected={true}
       key="0"
       onClick={[Function]}
@@ -237,7 +227,6 @@ exports[`statusCheckState failed status check - error 1`] = `
       OSX
     </EuiTab>
     <EuiTab
-      disabled={false}
       isSelected={false}
       key="1"
       onClick={[Function]}
@@ -280,7 +269,7 @@ exports[`statusCheckState failed status check - error 1`] = `
         },
         Object {
           "children": <React.Fragment>
-            <EuiFlexGroup
+            <ForwardRef
               alignItems="center"
               justifyContent="spaceBetween"
             >
@@ -293,18 +282,13 @@ exports[`statusCheckState failed status check - error 1`] = `
                 grow={false}
               >
                 <EuiButton
-                  color="primary"
-                  fill={false}
-                  iconSide="left"
                   isLoading={false}
                   onClick={[Function]}
-                  size="m"
-                  type="button"
                 >
                   custom btn label
                 </EuiButton>
               </EuiFlexItem>
-            </EuiFlexGroup>
+            </ForwardRef>
             <EuiSpacer
               size="s"
             />
@@ -352,7 +336,6 @@ exports[`statusCheckState failed status check - no data 1`] = `
     size="m"
   >
     <EuiTab
-      disabled={false}
       isSelected={true}
       key="0"
       onClick={[Function]}
@@ -360,7 +343,6 @@ exports[`statusCheckState failed status check - no data 1`] = `
       OSX
     </EuiTab>
     <EuiTab
-      disabled={false}
       isSelected={false}
       key="1"
       onClick={[Function]}
@@ -403,7 +385,7 @@ exports[`statusCheckState failed status check - no data 1`] = `
         },
         Object {
           "children": <React.Fragment>
-            <EuiFlexGroup
+            <ForwardRef
               alignItems="center"
               justifyContent="spaceBetween"
             >
@@ -416,18 +398,13 @@ exports[`statusCheckState failed status check - no data 1`] = `
                 grow={false}
               >
                 <EuiButton
-                  color="primary"
-                  fill={false}
-                  iconSide="left"
                   isLoading={false}
                   onClick={[Function]}
-                  size="m"
-                  type="button"
                 >
                   custom btn label
                 </EuiButton>
               </EuiFlexItem>
-            </EuiFlexGroup>
+            </ForwardRef>
             <EuiSpacer
               size="s"
             />
@@ -475,7 +452,6 @@ exports[`statusCheckState initial state - no check has been attempted 1`] = `
     size="m"
   >
     <EuiTab
-      disabled={false}
       isSelected={true}
       key="0"
       onClick={[Function]}
@@ -483,7 +459,6 @@ exports[`statusCheckState initial state - no check has been attempted 1`] = `
       OSX
     </EuiTab>
     <EuiTab
-      disabled={false}
       isSelected={false}
       key="1"
       onClick={[Function]}
@@ -526,7 +501,7 @@ exports[`statusCheckState initial state - no check has been attempted 1`] = `
         },
         Object {
           "children": <React.Fragment>
-            <EuiFlexGroup
+            <ForwardRef
               alignItems="center"
               justifyContent="spaceBetween"
             >
@@ -539,18 +514,13 @@ exports[`statusCheckState initial state - no check has been attempted 1`] = `
                 grow={false}
               >
                 <EuiButton
-                  color="primary"
-                  fill={false}
-                  iconSide="left"
                   isLoading={true}
                   onClick={[Function]}
-                  size="m"
-                  type="button"
                 >
                   custom btn label
                 </EuiButton>
               </EuiFlexItem>
-            </EuiFlexGroup>
+            </ForwardRef>
             <EuiSpacer
               size="s"
             />
@@ -593,7 +563,6 @@ exports[`statusCheckState successful status check 1`] = `
     size="m"
   >
     <EuiTab
-      disabled={false}
       isSelected={true}
       key="0"
       onClick={[Function]}
@@ -601,7 +570,6 @@ exports[`statusCheckState successful status check 1`] = `
       OSX
     </EuiTab>
     <EuiTab
-      disabled={false}
       isSelected={false}
       key="1"
       onClick={[Function]}
@@ -644,7 +612,7 @@ exports[`statusCheckState successful status check 1`] = `
         },
         Object {
           "children": <React.Fragment>
-            <EuiFlexGroup
+            <ForwardRef
               alignItems="center"
               justifyContent="spaceBetween"
             >
@@ -657,18 +625,13 @@ exports[`statusCheckState successful status check 1`] = `
                 grow={false}
               >
                 <EuiButton
-                  color="primary"
-                  fill={false}
-                  iconSide="left"
                   isLoading={false}
                   onClick={[Function]}
-                  size="m"
-                  type="button"
                 >
                   custom btn label
                 </EuiButton>
               </EuiFlexItem>
-            </EuiFlexGroup>
+            </ForwardRef>
             <EuiSpacer
               size="s"
             />
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap
index bc64579a4d71b..918bcbf7415e8 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap
@@ -26,14 +26,9 @@ exports[`props exportedFieldsUrl 1`] = `
     <div>
       <EuiSpacer />
       <EuiButton
-        color="primary"
-        fill={false}
         href="exported_fields_url"
-        iconSide="left"
         rel="noopener"
-        size="m"
         target="_blank"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="View exported fields"
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
index 0256e97798fa7..002264b0f2749 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
@@ -120,7 +120,7 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1
       Array [
         Object {
           "children": <React.Fragment>
-            <EuiFlexGroup
+            <ForwardRef
               alignItems="center"
               justifyContent="spaceBetween"
             >
@@ -135,19 +135,14 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1
                 grow={false}
               >
                 <EuiButton
-                  color="primary"
                   data-test-subj="loadSavedObjects"
-                  fill={false}
-                  iconSide="left"
                   isLoading={false}
                   onClick={[Function]}
-                  size="m"
-                  type="button"
                 >
                   Load Kibana objects
                 </EuiButton>
               </EuiFlexItem>
-            </EuiFlexGroup>
+            </ForwardRef>
             <EuiSpacer
               size="s"
             />
@@ -246,14 +241,9 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1
                     className="euiFlexItem euiFlexItem--flexGrowZero"
                   >
                     <EuiButton
-                      color="primary"
                       data-test-subj="loadSavedObjects"
-                      fill={false}
-                      iconSide="left"
                       isLoading={false}
                       onClick={[Function]}
-                      size="m"
-                      type="button"
                     >
                       <button
                         className="euiButton euiButton--primary"
@@ -432,7 +422,7 @@ exports[`bulkCreate should display success message when bulkCreate is successful
       Array [
         Object {
           "children": <React.Fragment>
-            <EuiFlexGroup
+            <ForwardRef
               alignItems="center"
               justifyContent="spaceBetween"
             >
@@ -447,19 +437,14 @@ exports[`bulkCreate should display success message when bulkCreate is successful
                 grow={false}
               >
                 <EuiButton
-                  color="primary"
                   data-test-subj="loadSavedObjects"
-                  fill={false}
-                  iconSide="left"
                   isLoading={false}
                   onClick={[Function]}
-                  size="m"
-                  type="button"
                 >
                   Load Kibana objects
                 </EuiButton>
               </EuiFlexItem>
-            </EuiFlexGroup>
+            </ForwardRef>
             <EuiSpacer
               size="s"
             />
@@ -592,14 +577,9 @@ exports[`bulkCreate should display success message when bulkCreate is successful
                     className="euiFlexItem euiFlexItem--flexGrowZero"
                   >
                     <EuiButton
-                      color="primary"
                       data-test-subj="loadSavedObjects"
-                      fill={false}
-                      iconSide="left"
                       isLoading={false}
                       onClick={[Function]}
-                      size="m"
-                      type="button"
                     >
                       <button
                         className="euiButton euiButton--primary"
@@ -664,7 +644,7 @@ exports[`renders 1`] = `
     Array [
       Object {
         "children": <React.Fragment>
-          <EuiFlexGroup
+          <ForwardRef
             alignItems="center"
             justifyContent="spaceBetween"
           >
@@ -679,19 +659,14 @@ exports[`renders 1`] = `
               grow={false}
             >
               <EuiButton
-                color="primary"
                 data-test-subj="loadSavedObjects"
-                fill={false}
-                iconSide="left"
                 isLoading={false}
                 onClick={[Function]}
-                size="m"
-                type="button"
               >
                 Load Kibana objects
               </EuiButton>
             </EuiFlexItem>
-          </EuiFlexGroup>
+          </ForwardRef>
           <EuiSpacer
             size="s"
           />
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
index 42620076ceffe..8bb27a94c0964 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
@@ -18,8 +18,6 @@ exports[`isCloudEnabled is false should not render instruction toggle when ON_PR
       />
       <EuiSpacer />
       <EuiPanel
-        grow={true}
-        hasShadow={false}
         paddingSize="l"
       >
         <InjectIntl(InstructionSetUi)
@@ -74,10 +72,8 @@ exports[`isCloudEnabled is false should render ON_PREM instructions with instruc
             grow={false}
           >
             <EuiButtonGroup
-              buttonSize="s"
               color="primary"
               idSelected="onPrem"
-              idToSelectedMap={Object {}}
               onChange={[Function]}
               options={
                 Array [
@@ -91,15 +87,12 @@ exports[`isCloudEnabled is false should render ON_PREM instructions with instruc
                   },
                 ]
               }
-              type="single"
             />
           </EuiFlexItem>
         </EuiFlexGroup>
       </div>
       <EuiSpacer />
       <EuiPanel
-        grow={true}
-        hasShadow={false}
         paddingSize="l"
       >
         <InjectIntl(InstructionSetUi)
@@ -149,8 +142,6 @@ exports[`should render ELASTIC_CLOUD instructions when isCloudEnabled is true 1`
       />
       <EuiSpacer />
       <EuiPanel
-        grow={true}
-        hasShadow={false}
         paddingSize="l"
       >
         <InjectIntl(InstructionSetUi)
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap
index af5e95b2ffcd9..5f366f4203c01 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap
@@ -57,12 +57,8 @@ exports[`EmptyState should render normally 1`] = `
     <EuiButton
       color="warning"
       data-test-subj="refreshIndicesButton"
-      fill={false}
-      iconSide="left"
       iconType="refresh"
       onClick={[Function]}
-      size="m"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Check for new data"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap
index b35be7f661bd4..f44fa3bdba8bd 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap
@@ -93,15 +93,10 @@ exports[`Header should mark the input as invalid 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         data-test-subj="createIndexPatternGoToStep2Button"
-        fill={false}
-        iconSide="left"
         iconType="arrowRight"
         isDisabled={true}
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Next step"
@@ -203,15 +198,10 @@ exports[`Header should render normally 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         data-test-subj="createIndexPatternGoToStep2Button"
-        fill={false}
-        iconSide="left"
         iconType="arrowRight"
         isDisabled={false}
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Next step"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/__snapshots__/indices_list.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/__snapshots__/indices_list.test.js.snap
index 6a26681e2f5e4..a759b3b3e9881 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/__snapshots__/indices_list.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/__snapshots__/indices_list.test.js.snap
@@ -2,57 +2,23 @@
 
 exports[`IndicesList should change pages 1`] = `
 <div>
-  <EuiTable
-    responsive={true}
-  >
+  <EuiTable>
     <EuiTableBody>
       <EuiTableRow
         key="0"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="1"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
     </EuiTableBody>
   </EuiTable>
@@ -75,7 +41,6 @@ exports[`IndicesList should change pages 1`] = `
             iconType="arrowDown"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Rows per page: {perPage}"
@@ -103,33 +68,25 @@ exports[`IndicesList should change pages 1`] = `
             Array [
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 5
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 10
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 20
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 50
               </EuiContextMenuItem>,
@@ -144,33 +101,15 @@ exports[`IndicesList should change pages 1`] = `
 
 exports[`IndicesList should change per page 1`] = `
 <div>
-  <EuiTable
-    responsive={true}
-  >
+  <EuiTable>
     <EuiTableBody>
       <EuiTableRow
         key="0"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
     </EuiTableBody>
   </EuiTable>
@@ -193,7 +132,6 @@ exports[`IndicesList should change per page 1`] = `
             iconType="arrowDown"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Rows per page: {perPage}"
@@ -221,33 +159,25 @@ exports[`IndicesList should change per page 1`] = `
             Array [
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 5
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 10
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 20
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 50
               </EuiContextMenuItem>,
@@ -271,22 +201,12 @@ exports[`IndicesList should change per page 1`] = `
 
 exports[`IndicesList should highlight the query in the matches 1`] = `
 <div>
-  <EuiTable
-    responsive={true}
-  >
+  <EuiTable>
     <EuiTableBody>
       <EuiTableRow
         key="0"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           <span>
             <strong>
               ki
@@ -294,39 +214,15 @@ exports[`IndicesList should highlight the query in the matches 1`] = `
             bana
           </span>
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="1"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
     </EuiTableBody>
   </EuiTable>
@@ -349,7 +245,6 @@ exports[`IndicesList should highlight the query in the matches 1`] = `
             iconType="arrowDown"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Rows per page: {perPage}"
@@ -377,33 +272,25 @@ exports[`IndicesList should highlight the query in the matches 1`] = `
             Array [
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 5
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 10
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 20
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 50
               </EuiContextMenuItem>,
@@ -418,57 +305,23 @@ exports[`IndicesList should highlight the query in the matches 1`] = `
 
 exports[`IndicesList should render normally 1`] = `
 <div>
-  <EuiTable
-    responsive={true}
-  >
+  <EuiTable>
     <EuiTableBody>
       <EuiTableRow
         key="0"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="1"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
     </EuiTableBody>
   </EuiTable>
@@ -491,7 +344,6 @@ exports[`IndicesList should render normally 1`] = `
             iconType="arrowDown"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Rows per page: {perPage}"
@@ -519,33 +371,25 @@ exports[`IndicesList should render normally 1`] = `
             Array [
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 5
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 10
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 20
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 50
               </EuiContextMenuItem>,
@@ -560,249 +404,87 @@ exports[`IndicesList should render normally 1`] = `
 
 exports[`IndicesList updating props should render all new indices 1`] = `
 <div>
-  <EuiTable
-    responsive={true}
-  >
+  <EuiTable>
     <EuiTableBody>
       <EuiTableRow
         key="0"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="1"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="2"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="3"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="4"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="5"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="6"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="7"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="8"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           kibana
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
       <EuiTableRow
         key="9"
       >
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        >
+        <EuiTableRowCell>
           es
         </EuiTableRowCell>
-        <EuiTableRowCell
-          align="left"
-          mobileOptions={
-            Object {
-              "show": true,
-            }
-          }
-          textOnly={true}
-        />
+        <EuiTableRowCell />
       </EuiTableRow>
     </EuiTableBody>
   </EuiTable>
@@ -825,7 +507,6 @@ exports[`IndicesList updating props should render all new indices 1`] = `
             iconType="arrowDown"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Rows per page: {perPage}"
@@ -853,33 +534,25 @@ exports[`IndicesList updating props should render all new indices 1`] = `
             Array [
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 5
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 10
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 20
               </EuiContextMenuItem>,
               <EuiContextMenuItem
                 icon="empty"
-                layoutAlign="center"
                 onClick={[Function]}
-                toolTipPosition="right"
               >
                 50
               </EuiContextMenuItem>,
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap
index 3f25b180c9e1c..57910f2ec8aac 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap
@@ -18,8 +18,6 @@ exports[`StepTimeField should enable the action button if the user decides to no
 
 exports[`StepTimeField should render "Custom index pattern ID already exists" when error is "Conflict" 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <Header
@@ -87,11 +85,7 @@ exports[`StepTimeField should render "Custom index pattern ID already exists" wh
 `;
 
 exports[`StepTimeField should render a loading state when creating the index pattern 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiFlexGroup
     alignItems="center"
   >
@@ -117,8 +111,6 @@ exports[`StepTimeField should render a loading state when creating the index pat
 
 exports[`StepTimeField should render a selected timeField 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <Header
@@ -175,8 +167,6 @@ exports[`StepTimeField should render a selected timeField 1`] = `
 
 exports[`StepTimeField should render advanced options 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <Header
@@ -222,8 +212,6 @@ exports[`StepTimeField should render advanced options 1`] = `
 
 exports[`StepTimeField should render advanced options with an index pattern id 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <Header
@@ -269,8 +257,6 @@ exports[`StepTimeField should render advanced options with an index pattern id 1
 
 exports[`StepTimeField should render any error message 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <Header
@@ -335,8 +321,6 @@ exports[`StepTimeField should render any error message 1`] = `
 
 exports[`StepTimeField should render normally 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <Header
@@ -382,8 +366,6 @@ exports[`StepTimeField should render normally 1`] = `
 
 exports[`StepTimeField should render timeFields 1`] = `
 <EuiPanel
-  grow={true}
-  hasShadow={false}
   paddingSize="l"
 >
   <Header
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__jest__/__snapshots__/advanced_options.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__jest__/__snapshots__/advanced_options.test.js.snap
index 17f0d860720fb..9dbc052d143f3 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__jest__/__snapshots__/advanced_options.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__jest__/__snapshots__/advanced_options.test.js.snap
@@ -3,11 +3,8 @@
 exports[`AdvancedOptions should hide if not showing 1`] = `
 <div>
   <EuiButtonEmpty
-    color="primary"
-    iconSide="left"
     iconType="arrowRight"
     onClick={[Function]}
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Show advanced options"
@@ -24,11 +21,8 @@ exports[`AdvancedOptions should hide if not showing 1`] = `
 exports[`AdvancedOptions should render normally 1`] = `
 <div>
   <EuiButtonEmpty
-    color="primary"
-    iconSide="left"
     iconType="arrowRight"
     onClick={[Function]}
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Show advanced options"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap
index f612c43661bac..2e5d07a45df4f 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap
@@ -25,7 +25,7 @@ exports[`TimeField should render a loading state 1`] = `
       </div>
     }
     label={
-      <EuiFlexGroup
+      <ForwardRef
         alignItems="center"
         gutterSize="xs"
         justifyContent="spaceBetween"
@@ -48,7 +48,7 @@ exports[`TimeField should render a loading state 1`] = `
             size="s"
           />
         </EuiFlexItem>
-      </EuiFlexGroup>
+      </ForwardRef>
     }
     labelType="label"
   >
@@ -98,7 +98,7 @@ exports[`TimeField should render a selected time field 1`] = `
       </div>
     }
     label={
-      <EuiFlexGroup
+      <ForwardRef
         alignItems="center"
         gutterSize="xs"
         justifyContent="spaceBetween"
@@ -130,7 +130,7 @@ exports[`TimeField should render a selected time field 1`] = `
             />
           </EuiLink>
         </EuiFlexItem>
-      </EuiFlexGroup>
+      </ForwardRef>
     }
     labelType="label"
   >
@@ -182,7 +182,7 @@ exports[`TimeField should render normally 1`] = `
       </div>
     }
     label={
-      <EuiFlexGroup
+      <ForwardRef
         alignItems="center"
         gutterSize="xs"
         justifyContent="spaceBetween"
@@ -214,7 +214,7 @@ exports[`TimeField should render normally 1`] = `
             />
           </EuiLink>
         </EuiFlexItem>
-      </EuiFlexGroup>
+      </ForwardRef>
     }
     labelType="label"
   >
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap
index b3a9d78dc9de1..2e694b6363117 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap
@@ -30,13 +30,8 @@ exports[`Header should render normally 1`] = `
     grow={false}
   >
     <EuiButton
-      color="primary"
       data-test-subj="addScriptedFieldLink"
-      fill={false}
       href=""
-      iconSide="left"
-      size="m"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Add scripted field"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/__jest__/__snapshots__/add_filter.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/__jest__/__snapshots__/add_filter.test.js.snap
index df4b3325dc5da..432c57d4f473d 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/__jest__/__snapshots__/add_filter.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/__jest__/__snapshots__/add_filter.test.js.snap
@@ -16,13 +16,8 @@ exports[`AddFilter should ignore strings with just spaces 1`] = `
   </EuiFlexItem>
   <EuiFlexItem>
     <EuiButton
-      color="primary"
-      fill={false}
-      iconSide="left"
       isDisabled={true}
       onClick={[Function]}
-      size="m"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Add"
@@ -50,13 +45,8 @@ exports[`AddFilter should render normally 1`] = `
   </EuiFlexItem>
   <EuiFlexItem>
     <EuiButton
-      color="primary"
-      fill={false}
-      iconSide="left"
       isDisabled={true}
       onClick={[Function]}
-      size="m"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Add"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap
index 80f44fbcb5d04..415bae7389e97 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap
@@ -4,21 +4,15 @@ exports[`Table editing should show a save button 1`] = `
 <div>
   <EuiButtonIcon
     aria-label="Save"
-    color="primary"
-    iconSize="m"
     iconType="checkInCircleFilled"
     onClick={[Function]}
     size="s"
-    type="button"
   />
   <EuiButtonIcon
     aria-label="Cancel"
-    color="primary"
-    iconSize="m"
     iconType="cross"
     onClick={[Function]}
     size="s"
-    type="button"
   />
 </div>
 `;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
index f9b79266d4253..0dc3ef2f44ea8 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
@@ -165,10 +165,7 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
             grow={false}
           >
             <EuiButtonEmpty
-              color="primary"
-              iconSide="left"
               onClick={[Function]}
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Cancel"
@@ -181,12 +178,8 @@ exports[`ObjectsTable export should allow the user to choose when exporting all
             grow={false}
           >
             <EuiButton
-              color="primary"
               fill={true}
-              iconSide="left"
               onClick={[Function]}
-              size="m"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Export all"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
index 4771aae2284ca..7fb517451aa16 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
@@ -129,11 +129,8 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
         grow={false}
       >
         <EuiButtonEmpty
-          color="primary"
-          iconSide="left"
           onClick={[MockFunction]}
           size="s"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -146,14 +143,11 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="importSavedObjectsConfirmBtn"
           fill={true}
-          iconSide="left"
           isLoading={false}
           onClick={[Function]}
           size="s"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Confirm all changes"
@@ -469,11 +463,8 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         grow={false}
       >
         <EuiButtonEmpty
-          color="primary"
-          iconSide="left"
           onClick={[MockFunction]}
           size="s"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -486,14 +477,11 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="importSavedObjectsConfirmBtn"
           fill={true}
-          iconSide="left"
           isLoading={false}
           onClick={[Function]}
           size="s"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Confirm all changes"
@@ -663,11 +651,8 @@ exports[`Flyout should render import step 1`] = `
         grow={false}
       >
         <EuiButtonEmpty
-          color="primary"
-          iconSide="left"
           onClick={[MockFunction]}
           size="s"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -680,14 +665,11 @@ exports[`Flyout should render import step 1`] = `
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="importSavedObjectsImportBtn"
           fill={true}
-          iconSide="left"
           isLoading={false}
           onClick={[Function]}
           size="s"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Import"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap
index e51c8d9f9c7a2..51bd51a5e2e58 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap
@@ -31,13 +31,10 @@ exports[`Header should render normally 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
             data-test-subj="exportAllObjects"
-            iconSide="left"
             iconType="exportAction"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Export {filteredCount, plural, one{# object} other {# objects}}"
@@ -54,13 +51,10 @@ exports[`Header should render normally 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
             data-test-subj="importObjects"
-            iconSide="left"
             iconType="importAction"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Import"
@@ -73,12 +67,9 @@ exports[`Header should render normally 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             iconType="refresh"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Refresh"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap
index 5f889cac4e94a..acc431d54949f 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap
@@ -29,14 +29,10 @@ exports[`Table prevents saved objects from being deleted 1`] = `
         <EuiButton
           color="danger"
           data-test-subj="savedObjectsManagementDelete"
-          fill={false}
-          iconSide="left"
           iconType="trash"
           isDisabled={true}
           onClick={[Function]}
-          size="m"
           title="Unable to delete saved objects"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Delete"
@@ -48,14 +44,10 @@ exports[`Table prevents saved objects from being deleted 1`] = `
           anchorPosition="downCenter"
           button={
             <EuiButton
-              color="primary"
-              fill={false}
               iconSide="right"
               iconType="arrowDown"
               isDisabled={false}
               onClick={[Function]}
-              size="m"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Export"
@@ -104,13 +96,9 @@ exports[`Table prevents saved objects from being deleted 1`] = `
             labelType="label"
           >
             <EuiButton
-              color="primary"
               fill={true}
-              iconSide="left"
               iconType="exportAction"
               onClick={[Function]}
-              size="m"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Export"
@@ -245,13 +233,9 @@ exports[`Table should render normally 1`] = `
         <EuiButton
           color="danger"
           data-test-subj="savedObjectsManagementDelete"
-          fill={false}
-          iconSide="left"
           iconType="trash"
           isDisabled={false}
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Delete"
@@ -263,14 +247,10 @@ exports[`Table should render normally 1`] = `
           anchorPosition="downCenter"
           button={
             <EuiButton
-              color="primary"
-              fill={false}
               iconSide="right"
               iconType="arrowDown"
               isDisabled={false}
               onClick={[Function]}
-              size="m"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Export"
@@ -319,13 +299,9 @@ exports[`Table should render normally 1`] = `
             labelType="label"
           >
             <EuiButton
-              color="primary"
               fill={true}
-              iconSide="left"
               iconType="exportAction"
               onClick={[Function]}
-              size="m"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Export"
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/form/__snapshots__/form.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/form/__snapshots__/form.test.js.snap
index 0fa95c561001f..eae7a69a74a4f 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/form/__snapshots__/form.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/form/__snapshots__/form.test.js.snap
@@ -5,8 +5,6 @@ exports[`Form should not render no settings message when instructed not to 1`] =
 exports[`Form should render no settings message when there are no settings 1`] = `
 <Fragment>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <FormattedMessage
@@ -35,8 +33,6 @@ exports[`Form should render no settings message when there are no settings 1`] =
 exports[`Form should render normally 1`] = `
 <Fragment>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <EuiForm>
@@ -96,8 +92,6 @@ exports[`Form should render normally 1`] = `
     size="l"
   />
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <EuiForm>
@@ -139,8 +133,6 @@ exports[`Form should render normally 1`] = `
     size="l"
   />
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <EuiForm>
@@ -216,8 +208,6 @@ exports[`Form should render normally 1`] = `
 exports[`Form should render read-only when saving is disabled 1`] = `
 <Fragment>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <EuiForm>
@@ -277,8 +267,6 @@ exports[`Form should render read-only when saving is disabled 1`] = `
     size="l"
   />
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <EuiForm>
@@ -320,8 +308,6 @@ exports[`Form should render read-only when saving is disabled 1`] = `
     size="l"
   />
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <EuiForm>
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index d4de02edfca1e..459d66e46a007 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -371,11 +371,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
         onClose={[Function]}
         role="menu"
       >
-        <EuiFocusTrap
-          clickOutsideDisables={false}
-          disabled={false}
-          returnFocus={true}
-        >
+        <EuiFocusTrap>
           <FocusLock
             as="div"
             autoFocus={true}
@@ -852,10 +848,8 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                     aria-label="Closes this modal window"
                     className="euiModal__closeIcon"
                     color="text"
-                    iconSize="m"
                     iconType="cross"
                     onClick={[Function]}
-                    type="button"
                   >
                     <button
                       aria-label="Closes this modal window"
@@ -1707,11 +1701,7 @@ exports[`NewVisModal should render as expected 1`] = `
         onClose={[Function]}
         role="menu"
       >
-        <EuiFocusTrap
-          clickOutsideDisables={false}
-          disabled={false}
-          returnFocus={true}
-        >
+        <EuiFocusTrap>
           <FocusLock
             as="div"
             autoFocus={true}
@@ -2182,10 +2172,8 @@ exports[`NewVisModal should render as expected 1`] = `
                     aria-label="Closes this modal window"
                     className="euiModal__closeIcon"
                     color="text"
-                    iconSize="m"
                     iconType="cross"
                     onClick={[Function]}
-                    type="button"
                   >
                     <button
                       aria-label="Closes this modal window"
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap b/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
index f1bd4cbcc0669..9a47fff2745c3 100644
--- a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
+++ b/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
@@ -174,13 +174,9 @@ exports[`ShardFailureModal renders matching snapshot given valid properties 1`]
       <Component />
     </EuiCopy>
     <EuiButton
-      color="primary"
       data-test-sub="closeShardFailureModal"
       fill={true}
-      iconSide="left"
       onClick={[Function]}
-      size="m"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Close"
diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/__snapshots__/color.test.js.snap b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/__snapshots__/color.test.js.snap
index 0a2ba6a12ce43..5e0df71f180c5 100644
--- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/__snapshots__/color.test.js.snap
+++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/__snapshots__/color.test.js.snap
@@ -64,13 +64,9 @@ exports[`ColorFormatEditorComponent should render multiple colors 1`] = `
     size="m"
   />
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     iconType="plusInCircle"
     onClick={[Function]}
     size="s"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add color"
@@ -141,13 +137,9 @@ exports[`ColorFormatEditorComponent should render other type normally (range fie
     size="m"
   />
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     iconType="plusInCircle"
     onClick={[Function]}
     size="s"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add color"
@@ -218,13 +210,9 @@ exports[`ColorFormatEditorComponent should render string type normally (regex fi
     size="m"
   />
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     iconType="plusInCircle"
     onClick={[Function]}
     size="s"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add color"
diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.js.snap b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.js.snap
index c991f2e2f33cb..2c8db5390884e 100644
--- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.js.snap
+++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.js.snap
@@ -56,13 +56,9 @@ exports[`StaticLookupFormatEditorComponent should render multiple lookup entries
     size="m"
   />
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     iconType="plusInCircle"
     onClick={[Function]}
     size="s"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add entry"
@@ -151,13 +147,9 @@ exports[`StaticLookupFormatEditorComponent should render normally 1`] = `
     size="m"
   />
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     iconType="plusInCircle"
     onClick={[Function]}
     size="s"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add entry"
diff --git a/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap b/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap
index c57035d563aa0..429761b8744b4 100644
--- a/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap
+++ b/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap
@@ -37,7 +37,7 @@ exports[`render 1`] = `
           Object {
             "data-test-subj": "exportAsSnapshot",
             "id": "snapshot",
-            "label": <EuiFlexGroup
+            "label": <ForwardRef
               gutterSize="none"
               responsive={false}
             >
@@ -66,13 +66,13 @@ exports[`render 1`] = `
                   position="bottom"
                 />
               </EuiFlexItem>
-            </EuiFlexGroup>,
+            </ForwardRef>,
           },
           Object {
             "data-test-subj": "exportAsSavedObject",
             "disabled": true,
             "id": "savedObject",
-            "label": <EuiFlexGroup
+            "label": <ForwardRef
               gutterSize="none"
               responsive={false}
             >
@@ -101,7 +101,7 @@ exports[`render 1`] = `
                   position="bottom"
                 />
               </EuiFlexItem>
-            </EuiFlexGroup>,
+            </ForwardRef>,
           },
         ]
       }
@@ -184,7 +184,7 @@ exports[`should enable saved object export option when objectId is provided 1`]
           Object {
             "data-test-subj": "exportAsSnapshot",
             "id": "snapshot",
-            "label": <EuiFlexGroup
+            "label": <ForwardRef
               gutterSize="none"
               responsive={false}
             >
@@ -213,13 +213,13 @@ exports[`should enable saved object export option when objectId is provided 1`]
                   position="bottom"
                 />
               </EuiFlexItem>
-            </EuiFlexGroup>,
+            </ForwardRef>,
           },
           Object {
             "data-test-subj": "exportAsSavedObject",
             "disabled": false,
             "id": "savedObject",
-            "label": <EuiFlexGroup
+            "label": <ForwardRef
               gutterSize="none"
               responsive={false}
             >
@@ -248,7 +248,7 @@ exports[`should enable saved object export option when objectId is provided 1`]
                   position="bottom"
                 />
               </EuiFlexItem>
-            </EuiFlexGroup>,
+            </ForwardRef>,
           },
         ]
       }
@@ -331,7 +331,7 @@ exports[`should hide short url section when allowShortUrl is false 1`] = `
           Object {
             "data-test-subj": "exportAsSnapshot",
             "id": "snapshot",
-            "label": <EuiFlexGroup
+            "label": <ForwardRef
               gutterSize="none"
               responsive={false}
             >
@@ -360,13 +360,13 @@ exports[`should hide short url section when allowShortUrl is false 1`] = `
                   position="bottom"
                 />
               </EuiFlexItem>
-            </EuiFlexGroup>,
+            </ForwardRef>,
           },
           Object {
             "data-test-subj": "exportAsSavedObject",
             "disabled": false,
             "id": "savedObject",
-            "label": <EuiFlexGroup
+            "label": <ForwardRef
               gutterSize="none"
               responsive={false}
             >
@@ -395,7 +395,7 @@ exports[`should hide short url section when allowShortUrl is false 1`] = `
                   position="bottom"
                 />
               </EuiFlexItem>
-            </EuiFlexGroup>,
+            </ForwardRef>,
           },
         ]
       }
diff --git a/src/legacy/ui/public/vis/editors/default/components/__snapshots__/agg.test.tsx.snap b/src/legacy/ui/public/vis/editors/default/components/__snapshots__/agg.test.tsx.snap
index d9059d495f988..b78503b298d04 100644
--- a/src/legacy/ui/public/vis/editors/default/components/__snapshots__/agg.test.tsx.snap
+++ b/src/legacy/ui/public/vis/editors/default/components/__snapshots__/agg.test.tsx.snap
@@ -24,10 +24,8 @@ exports[`DefaultEditorAgg component should init with the default set of props 1`
           aria-label="Enable aggregation"
           color="text"
           data-test-subj="toggleDisableAggregationBtn enable"
-          iconSize="m"
           iconType="eyeClosed"
           onClick={[Function]}
-          type="button"
         />
       </EuiToolTip>
     </div>
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 843fd78b24be9..b865981768447 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
@@ -206,13 +206,11 @@ exports[`InspectorPanel should render as expected 1`] = `
                   anchorPosition="downRight"
                   button={
                     <EuiButtonEmpty
-                      color="primary"
                       data-test-subj="inspectorViewChooser"
                       iconSide="right"
                       iconType="arrowDown"
                       onClick={[Function]}
                       size="s"
-                      type="button"
                     >
                       <FormattedMessage
                         defaultMessage="View: {viewName}"
@@ -251,13 +249,11 @@ exports[`InspectorPanel should render as expected 1`] = `
                         className="euiPopover__anchor"
                       >
                         <EuiButtonEmpty
-                          color="primary"
                           data-test-subj="inspectorViewChooser"
                           iconSide="right"
                           iconType="arrowDown"
                           onClick={[Function]}
                           size="s"
-                          type="button"
                         >
                           <button
                             className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiButtonEmpty--iconRight"
diff --git a/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap
index adbde0bca33f9..37c77c97fe39d 100644
--- a/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap
@@ -576,9 +576,6 @@ exports[`Inspector Data View component should render loading state 1`] = `
           >
             <EuiPanel
               className="eui-textCenter"
-              grow={true}
-              hasShadow={false}
-              paddingSize="m"
             >
               <div
                 className="euiPanel euiPanel--paddingMedium eui-textCenter"
diff --git a/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap b/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap
index 5bf5c8be05ed8..af1fb5f647daf 100644
--- a/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap
+++ b/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap
@@ -54,11 +54,8 @@ exports[`SavedObjectSaveModal should render matching snapshot 1`] = `
       </EuiModalBody>
       <EuiModalFooter>
         <EuiButtonEmpty
-          color="primary"
           data-test-subj="saveCancelButton"
-          iconSide="left"
           onClick={[Function]}
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -67,13 +64,10 @@ exports[`SavedObjectSaveModal should render matching snapshot 1`] = `
           />
         </EuiButtonEmpty>
         <EuiButton
-          color="primary"
           data-test-subj="confirmSaveSavedObjectButton"
           fill={true}
-          iconSide="left"
           isDisabled={false}
           isLoading={false}
-          size="m"
           type="submit"
         >
           Save
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index 4ff17d490b0ad..146325244067a 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index 0a2a4d0151f88..00ef51a751b27 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "react": "^16.8.0"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
index 30454c901cfea..e86e63bf623b7 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "react": "^16.8.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
index cfa46eb2dceef..134b5152cdd21 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "react": "^16.8.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
index be080683bfc1d..05338e6d4d882 100644
--- a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/typings/@elastic/eui/index.d.ts b/typings/@elastic/eui/index.d.ts
index 39c5a7d7d2384..ed8f6e3409d40 100644
--- a/typings/@elastic/eui/index.d.ts
+++ b/typings/@elastic/eui/index.d.ts
@@ -21,8 +21,6 @@ import { Direction } from '@elastic/eui/src/services/sort/sort_direction';
 // TODO: Remove once typescript definitions are in EUI
 
 declare module '@elastic/eui' {
-  export const EuiWrappingPopover: React.SFC<any>;
-  export const EuiOutsideClickDetector: React.SFC<any>;
   export const EuiSideNav: React.SFC<any>;
 
   export interface EuiTableCriteria {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap
index 49435ee1f37fb..39b9e588ce008 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap
@@ -32,10 +32,7 @@ exports[`DetailView should render Discover button 1`] = `
   }
 >
   <EuiButtonEmpty
-    color="primary"
-    iconSide="left"
     iconType="discoverApp"
-    type="button"
   >
     View 10 occurrences in Discover
   </EuiButtonEmpty>
@@ -66,7 +63,6 @@ exports[`DetailView should render tabs 1`] = `
   size="m"
 >
   <EuiTab
-    disabled={false}
     isSelected={true}
     key="exception_stacktrace"
     onClick={[Function]}
@@ -74,7 +70,6 @@ exports[`DetailView should render tabs 1`] = `
     Exception stacktrace
   </EuiTab>
   <EuiTab
-    disabled={false}
     isSelected={false}
     key="metadata"
     onClick={[Function]}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
index 4aaad0218269c..cd5be4a06ca26 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
@@ -56,60 +56,66 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
       <div
         className="euiTableHeaderMobile"
       >
-        <div
-          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+        <EuiFlexGroup
+          alignItems="baseline"
+          justifyContent="spaceBetween"
+          responsive={false}
         >
           <div
-            className="euiFlexItem euiFlexItem--flexGrowZero"
-          />
-          <div
-            className="euiFlexItem euiFlexItem--flexGrowZero"
+            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
           >
             <div
-              className="euiTableSortMobile"
+              className="euiFlexItem euiFlexItem--flexGrowZero"
+            />
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <div
-                className="euiPopover euiPopover--anchorDownRight"
-                id="sortPopover"
-                onKeyDown={[Function]}
-                onMouseDown={[Function]}
-                onMouseUp={[Function]}
-                onTouchEnd={[Function]}
-                onTouchStart={[Function]}
+                className="euiTableSortMobile"
               >
                 <div
-                  className="euiPopover__anchor"
+                  className="euiPopover euiPopover--anchorDownRight"
+                  id="sortPopover"
+                  onKeyDown={[Function]}
+                  onMouseDown={[Function]}
+                  onMouseUp={[Function]}
+                  onTouchEnd={[Function]}
+                  onTouchStart={[Function]}
                 >
-                  <button
-                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiButtonEmpty--flushRight"
-                    onClick={[Function]}
-                    type="button"
+                  <div
+                    className="euiPopover__anchor"
                   >
-                    <span
-                      className="euiButtonEmpty__content"
+                    <button
+                      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiButtonEmpty--flushRight"
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <svg
-                        aria-hidden="true"
-                        className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
-                        focusable="false"
-                        height={16}
-                        style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
                       <span
-                        className="euiButtonEmpty__text"
+                        className="euiButtonEmpty__content"
                       >
-                        Sorting
+                        <svg
+                          aria-hidden="true"
+                          className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
+                          focusable="false"
+                          height={16}
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        />
+                        <span
+                          className="euiButtonEmpty__text"
+                        >
+                          Sorting
+                        </span>
                       </span>
-                    </span>
-                  </button>
+                    </button>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
+        </EuiFlexGroup>
       </div>
       <table
         className="euiTable euiTable--responsive"
@@ -268,60 +274,66 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
       <div
         className="euiSpacer euiSpacer--m"
       />
-      <div
-        className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+        responsive={false}
       >
         <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
         >
           <div
-            className="euiPopover euiPopover--anchorUpRight euiPopover--withTitle"
-            id="customizablePagination"
-            onKeyDown={[Function]}
-            onMouseDown={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <div
-              className="euiPopover__anchor"
+              className="euiPopover euiPopover--anchorUpRight euiPopover--withTitle"
+              id="customizablePagination"
+              onKeyDown={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              onTouchEnd={[Function]}
+              onTouchStart={[Function]}
             >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
-                onClick={[Function]}
-                type="button"
+              <div
+                className="euiPopover__anchor"
               >
-                <span
-                  className="euiButtonEmpty__content"
+                <button
+                  className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
+                  onClick={[Function]}
+                  type="button"
                 >
-                  <svg
-                    aria-hidden="true"
-                    className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
-                    focusable="false"
-                    height={16}
-                    style={null}
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
                   <span
-                    className="euiButtonEmpty__text"
+                    className="euiButtonEmpty__content"
                   >
-                    Rows per page
-                    : 
-                    25
+                    <svg
+                      aria-hidden="true"
+                      className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
+                      focusable="false"
+                      height={16}
+                      style={null}
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    />
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Rows per page
+                      : 
+                      25
+                    </span>
                   </span>
-                </span>
-              </button>
+                </button>
+              </div>
             </div>
           </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
+          >
+            <span />
+          </div>
         </div>
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <span />
-        </div>
-      </div>
+      </EuiFlexGroup>
     </div>
   </div>
 </Memo(UnoptimizedManagedTable)>
@@ -438,60 +450,66 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
       <div
         className="euiTableHeaderMobile"
       >
-        <div
-          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+        <EuiFlexGroup
+          alignItems="baseline"
+          justifyContent="spaceBetween"
+          responsive={false}
         >
           <div
-            className="euiFlexItem euiFlexItem--flexGrowZero"
-          />
-          <div
-            className="euiFlexItem euiFlexItem--flexGrowZero"
+            className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
           >
             <div
-              className="euiTableSortMobile"
+              className="euiFlexItem euiFlexItem--flexGrowZero"
+            />
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
             >
               <div
-                className="euiPopover euiPopover--anchorDownRight"
-                id="sortPopover"
-                onKeyDown={[Function]}
-                onMouseDown={[Function]}
-                onMouseUp={[Function]}
-                onTouchEnd={[Function]}
-                onTouchStart={[Function]}
+                className="euiTableSortMobile"
               >
                 <div
-                  className="euiPopover__anchor"
+                  className="euiPopover euiPopover--anchorDownRight"
+                  id="sortPopover"
+                  onKeyDown={[Function]}
+                  onMouseDown={[Function]}
+                  onMouseUp={[Function]}
+                  onTouchEnd={[Function]}
+                  onTouchStart={[Function]}
                 >
-                  <button
-                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiButtonEmpty--flushRight"
-                    onClick={[Function]}
-                    type="button"
+                  <div
+                    className="euiPopover__anchor"
                   >
-                    <span
-                      className="euiButtonEmpty__content"
+                    <button
+                      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiButtonEmpty--flushRight"
+                      onClick={[Function]}
+                      type="button"
                     >
-                      <svg
-                        aria-hidden="true"
-                        className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
-                        focusable="false"
-                        height={16}
-                        style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
                       <span
-                        className="euiButtonEmpty__text"
+                        className="euiButtonEmpty__content"
                       >
-                        Sorting
+                        <svg
+                          aria-hidden="true"
+                          className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
+                          focusable="false"
+                          height={16}
+                          style={null}
+                          viewBox="0 0 16 16"
+                          width={16}
+                          xmlns="http://www.w3.org/2000/svg"
+                        />
+                        <span
+                          className="euiButtonEmpty__text"
+                        >
+                          Sorting
+                        </span>
                       </span>
-                    </span>
-                  </button>
+                    </button>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
+        </EuiFlexGroup>
       </div>
       <table
         className="euiTable euiTable--responsive"
@@ -1060,60 +1078,66 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
       <div
         className="euiSpacer euiSpacer--m"
       />
-      <div
-        className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+        responsive={false}
       >
         <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
+          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
         >
           <div
-            className="euiPopover euiPopover--anchorUpRight euiPopover--withTitle"
-            id="customizablePagination"
-            onKeyDown={[Function]}
-            onMouseDown={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
+            className="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <div
-              className="euiPopover__anchor"
+              className="euiPopover euiPopover--anchorUpRight euiPopover--withTitle"
+              id="customizablePagination"
+              onKeyDown={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              onTouchEnd={[Function]}
+              onTouchStart={[Function]}
             >
-              <button
-                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
-                onClick={[Function]}
-                type="button"
+              <div
+                className="euiPopover__anchor"
               >
-                <span
-                  className="euiButtonEmpty__content"
+                <button
+                  className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
+                  onClick={[Function]}
+                  type="button"
                 >
-                  <svg
-                    aria-hidden="true"
-                    className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
-                    focusable="false"
-                    height={16}
-                    style={null}
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
                   <span
-                    className="euiButtonEmpty__text"
+                    className="euiButtonEmpty__content"
                   >
-                    Rows per page
-                    : 
-                    25
+                    <svg
+                      aria-hidden="true"
+                      className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
+                      focusable="false"
+                      height={16}
+                      style={null}
+                      viewBox="0 0 16 16"
+                      width={16}
+                      xmlns="http://www.w3.org/2000/svg"
+                    />
+                    <span
+                      className="euiButtonEmpty__text"
+                    >
+                      Rows per page
+                      : 
+                      25
+                    </span>
                   </span>
-                </span>
-              </button>
+                </button>
+              </div>
             </div>
           </div>
+          <div
+            className="euiFlexItem euiFlexItem--flexGrowZero"
+          >
+            <span />
+          </div>
         </div>
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <span />
-        </div>
-      </div>
+      </EuiFlexGroup>
     </div>
   </div>
 </Memo(UnoptimizedManagedTable)>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
index 530924cce22bb..838a47f0f546c 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
@@ -23,10 +23,8 @@ exports[`Home component should render services 1`] = `
         <SettingsLink>
           <EuiButtonEmpty
             color="primary"
-            iconSide="left"
             iconType="gear"
             size="s"
-            type="button"
           >
             Settings
           </EuiButtonEmpty>
@@ -91,10 +89,8 @@ exports[`Home component should render traces 1`] = `
         <SettingsLink>
           <EuiButtonEmpty
             color="primary"
-            iconSide="left"
             iconType="gear"
             size="s"
-            type="button"
           >
             Settings
           </EuiButtonEmpty>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
index 317fac87eea5a..0eb7db31133ab 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
@@ -210,18 +210,16 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
     }
   ]
     .filter(({ condition }) => condition)
-    .map(({ icon, key, child, condition }) =>
-      condition ? (
-        <EuiContextMenuItem icon={icon} key={key}>
-          <EuiFlexGroup gutterSize="s">
-            <EuiFlexItem>{child}</EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiIcon type="popout" />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiContextMenuItem>
-      ) : null
-    );
+    .map(({ icon, key, child }) => (
+      <EuiContextMenuItem icon={icon} key={key}>
+        <EuiFlexGroup gutterSize="s">
+          <EuiFlexItem>{child}</EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiIcon type="popout" />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiContextMenuItem>
+    ));
 
   return (
     <EuiPopover
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap
index 62f2cf332389b..ccc69a36a01ec 100644
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap
+++ b/x-pack/legacy/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap
@@ -590,11 +590,8 @@ exports[`render correctly with empty query string 1`] = `
                           className="kuiLocalSearchAssistedInput__assistance"
                         >
                           <EuiButtonEmpty
-                            color="primary"
-                            iconSide="left"
                             onClick={[Function]}
                             size="xs"
-                            type="button"
                           >
                             <button
                               className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
@@ -1311,11 +1308,8 @@ exports[`render correctly with input query string changed 1`] = `
                               className="kuiLocalSearchAssistedInput__assistance"
                             >
                               <EuiButtonEmpty
-                                color="primary"
-                                iconSide="left"
                                 onClick={[Function]}
                                 size="xs"
-                                type="button"
                               >
                                 <button
                                   className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx
index d267d6d73e7fc..5b71c9f7355fb 100644
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx
+++ b/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx
@@ -433,9 +433,11 @@ export class CodeQueryBar extends Component<Props, State> {
         </EuiFlexItem>
         <EuiFlexItem>
           <EuiOutsideClickDetector onOutsideClick={this.onOutsideClick}>
-            {/* position:relative required on container so the suggestions appear under the query bar*/}
             <div
-              style={{ position: 'relative' }}
+              style={{
+                // position:relative required on container so the suggestions appear under the query bar
+                position: 'relative',
+              }}
               role="combobox"
               aria-haspopup="true"
               aria-expanded={this.state.isSuggestionsVisible}
diff --git a/x-pack/legacy/plugins/infra/types/eui.d.ts b/x-pack/legacy/plugins/infra/types/eui.d.ts
index 8cd569efa2958..f117181eae43d 100644
--- a/x-pack/legacy/plugins/infra/types/eui.d.ts
+++ b/x-pack/legacy/plugins/infra/types/eui.d.ts
@@ -9,10 +9,6 @@
  *       package includes them.
  */
 
-declare module '@elastic/eui' {
-  export const EuiWrappingPopover: React.SFC<any>;
-}
-
 import { IconType, ToolTipPositions } from '@elastic/eui';
 import { CommonProps } from '@elastic/eui/src/components/common';
 import moment from 'moment';
@@ -45,13 +41,6 @@ declare module '@elastic/eui' {
   type EuiHeaderBreadcrumbsProps = EuiBreadcrumbsProps;
   export const EuiHeaderBreadcrumbs: React.SFC<EuiHeaderBreadcrumbsProps>;
 
-  interface EuiOutsideClickDetectorProps {
-    children: React.ReactNode;
-    isDisabled?: boolean;
-    onOutsideClick: React.MouseEventHandler<Element>;
-  }
-  export const EuiOutsideClickDetector: React.SFC<EuiOutsideClickDetectorProps>;
-
   interface EuiFormControlLayoutIconProps {
     type: IconType;
     side?: 'left' | 'right';
diff --git a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
index e82685d62a316..af576c7f8eaa0 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
@@ -140,8 +140,6 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
       >
         <EuiPanel
           className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <div
@@ -327,11 +325,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                         maxWidth={true}
                         onClose={[Function]}
                       >
-                        <EuiFocusTrap
-                          clickOutsideDisables={false}
-                          disabled={false}
-                          returnFocus={true}
-                        >
+                        <EuiFocusTrap>
                           <FocusLock
                             as="div"
                             autoFocus={true}
@@ -612,10 +606,8 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                     aria-label="Closes this modal window"
                                     className="euiModal__closeIcon"
                                     color="text"
-                                    iconSize="m"
                                     iconType="cross"
                                     onClick={[Function]}
-                                    type="button"
                                   >
                                     <button
                                       aria-label="Closes this modal window"
@@ -722,11 +714,8 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                     >
                                       <EuiButtonEmpty
                                         buttonRef={[Function]}
-                                        color="primary"
                                         data-test-subj="confirmModalCancelButton"
-                                        iconSide="left"
                                         onClick={[Function]}
-                                        type="button"
                                       >
                                         <button
                                           className="euiButtonEmpty euiButtonEmpty--primary"
@@ -756,10 +745,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                         color="primary"
                                         data-test-subj="confirmModalConfirmButton"
                                         fill={true}
-                                        iconSide="left"
                                         onClick={[Function]}
-                                        size="m"
-                                        type="button"
                                       >
                                         <button
                                           className="euiButton euiButton--primary euiButton--fill"
@@ -975,10 +961,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButtonEmpty
-                              color="primary"
                               href="#/management/elasticsearch/license_management/home"
-                              iconSide="left"
-                              type="button"
                             >
                               <a
                                 className="euiButtonEmpty euiButtonEmpty--primary"
@@ -1011,14 +994,10 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButton
-                              color="primary"
                               data-test-subj="uploadLicenseButton"
                               fill={true}
-                              iconSide="left"
                               isLoading={false}
                               onClick={[Function]}
-                              size="m"
-                              type="button"
                             >
                               <button
                                 className="euiButton euiButton--primary euiButton--fill"
@@ -1191,8 +1170,6 @@ exports[`UploadLicense should display an error when ES says license is expired 1
       >
         <EuiPanel
           className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <div
@@ -1436,10 +1413,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButtonEmpty
-                              color="primary"
                               href="#/management/elasticsearch/license_management/home"
-                              iconSide="left"
-                              type="button"
                             >
                               <a
                                 className="euiButtonEmpty euiButtonEmpty--primary"
@@ -1472,14 +1446,10 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButton
-                              color="primary"
                               data-test-subj="uploadLicenseButton"
                               fill={true}
-                              iconSide="left"
                               isLoading={false}
                               onClick={[Function]}
-                              size="m"
-                              type="button"
                             >
                               <button
                                 className="euiButton euiButton--primary euiButton--fill"
@@ -1652,8 +1622,6 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
       >
         <EuiPanel
           className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <div
@@ -1897,10 +1865,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButtonEmpty
-                              color="primary"
                               href="#/management/elasticsearch/license_management/home"
-                              iconSide="left"
-                              type="button"
                             >
                               <a
                                 className="euiButtonEmpty euiButtonEmpty--primary"
@@ -1933,14 +1898,10 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButton
-                              color="primary"
                               data-test-subj="uploadLicenseButton"
                               fill={true}
-                              iconSide="left"
                               isLoading={false}
                               onClick={[Function]}
-                              size="m"
-                              type="button"
                             >
                               <button
                                 className="euiButton euiButton--primary euiButton--fill"
@@ -2113,8 +2074,6 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
       >
         <EuiPanel
           className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <div
@@ -2354,10 +2313,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButtonEmpty
-                              color="primary"
                               href="#/management/elasticsearch/license_management/home"
-                              iconSide="left"
-                              type="button"
                             >
                               <a
                                 className="euiButtonEmpty euiButtonEmpty--primary"
@@ -2390,14 +2346,10 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButton
-                              color="primary"
                               data-test-subj="uploadLicenseButton"
                               fill={true}
-                              iconSide="left"
                               isLoading={false}
                               onClick={[Function]}
-                              size="m"
-                              type="button"
                             >
                               <button
                                 className="euiButton euiButton--primary euiButton--fill"
@@ -2570,8 +2522,6 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
       >
         <EuiPanel
           className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <div
@@ -2815,10 +2765,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButtonEmpty
-                              color="primary"
                               href="#/management/elasticsearch/license_management/home"
-                              iconSide="left"
-                              type="button"
                             >
                               <a
                                 className="euiButtonEmpty euiButtonEmpty--primary"
@@ -2851,14 +2798,10 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                             className="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <EuiButton
-                              color="primary"
                               data-test-subj="uploadLicenseButton"
                               fill={true}
-                              iconSide="left"
                               isLoading={false}
                               onClick={[Function]}
-                              size="m"
-                              type="button"
                             >
                               <button
                                 className="euiButton euiButton--primary euiButton--fill"
diff --git a/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap b/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
index 65985b3fa337a..638a55a5f4cee 100644
--- a/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
+++ b/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
@@ -284,14 +284,10 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnSavePipeline"
           fill={true}
-          iconSide="left"
           isDisabled={true}
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Create and deploy"
@@ -304,13 +300,8 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnCancel"
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -607,14 +598,10 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnSavePipeline"
           fill={true}
-          iconSide="left"
           isDisabled={true}
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Create and deploy"
@@ -627,13 +614,8 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnCancel"
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -930,14 +912,10 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnSavePipeline"
           fill={true}
-          iconSide="left"
           isDisabled={true}
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Create and deploy"
@@ -950,13 +928,8 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnCancel"
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -1224,14 +1197,10 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnSavePipeline"
           fill={true}
-          iconSide="left"
           isDisabled={false}
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Create and deploy"
@@ -1244,13 +1213,8 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnCancel"
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -1265,9 +1229,7 @@ Default value: 1024"
         <EuiButtonEmpty
           color="danger"
           data-test-subj="btnDeletePipeline"
-          iconSide="left"
           onClick={[Function]}
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Delete pipeline"
@@ -1560,14 +1522,10 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnSavePipeline"
           fill={true}
-          iconSide="left"
           isDisabled={false}
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Create and deploy"
@@ -1580,13 +1538,8 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnCancel"
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -1854,14 +1807,10 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnSavePipeline"
           fill={true}
-          iconSide="left"
           isDisabled={false}
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Create and deploy"
@@ -1874,13 +1823,8 @@ Default value: 1024"
         grow={false}
       >
         <EuiButton
-          color="primary"
           data-test-subj="btnCancel"
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -1895,9 +1839,7 @@ Default value: 1024"
         <EuiButtonEmpty
           color="danger"
           data-test-subj="btnDeletePipeline"
-          iconSide="left"
           onClick={[Function]}
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Delete pipeline"
diff --git a/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap b/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap
index 11d0df0b647a2..eb1a7e54afe8b 100644
--- a/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap
+++ b/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap
@@ -112,14 +112,10 @@ exports[`PipelinesTable component renders component as expected 1`] = `
       ],
       "toolsLeft": null,
       "toolsRight": <EuiButton
-        color="primary"
         data-test-subj="btnAdd"
         fill={true}
-        iconSide="left"
         isDisabled={false}
         onClick={[MockFunction]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Create pipeline"
diff --git a/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap b/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
index 7ac17cbc22421..b31bae263fa8f 100644
--- a/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
+++ b/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
@@ -122,8 +122,6 @@ exports[`UpgradeFailure component passes expected text for new pipeline 1`] = `
     >
       <EuiPanel
         className="euiPageContent"
-        grow={true}
-        hasShadow={false}
         paddingSize="l"
       >
         <div
@@ -276,12 +274,8 @@ exports[`UpgradeFailure component passes expected text for new pipeline 1`] = `
                         className="euiFlexItem euiFlexItem--flexGrowZero"
                       >
                         <EuiButton
-                          color="primary"
                           fill={true}
-                          iconSide="left"
                           onClick={[MockFunction]}
-                          size="m"
-                          type="button"
                         >
                           <button
                             className="euiButton euiButton--primary euiButton--fill"
@@ -309,9 +303,7 @@ exports[`UpgradeFailure component passes expected text for new pipeline 1`] = `
                       >
                         <EuiButtonEmpty
                           color="primary"
-                          iconSide="left"
                           onClick={[MockFunction]}
-                          type="button"
                         >
                           <button
                             className="euiButtonEmpty euiButtonEmpty--primary"
@@ -471,8 +463,6 @@ exports[`UpgradeFailure component passes expected text for not manual upgrade 1`
     >
       <EuiPanel
         className="euiPageContent"
-        grow={true}
-        hasShadow={false}
         paddingSize="l"
       >
         <div
@@ -625,12 +615,8 @@ exports[`UpgradeFailure component passes expected text for not manual upgrade 1`
                         className="euiFlexItem euiFlexItem--flexGrowZero"
                       >
                         <EuiButton
-                          color="primary"
                           fill={true}
-                          iconSide="left"
                           onClick={[MockFunction]}
-                          size="m"
-                          type="button"
                         >
                           <button
                             className="euiButton euiButton--primary euiButton--fill"
@@ -658,9 +644,7 @@ exports[`UpgradeFailure component passes expected text for not manual upgrade 1`
                       >
                         <EuiButtonEmpty
                           color="primary"
-                          iconSide="left"
                           onClick={[MockFunction]}
-                          type="button"
                         >
                           <button
                             className="euiButtonEmpty euiButtonEmpty--primary"
@@ -820,8 +804,6 @@ exports[`UpgradeFailure component passes expected text for not new pipeline 1`]
     >
       <EuiPanel
         className="euiPageContent"
-        grow={true}
-        hasShadow={false}
         paddingSize="l"
       >
         <div
@@ -974,12 +956,8 @@ exports[`UpgradeFailure component passes expected text for not new pipeline 1`]
                         className="euiFlexItem euiFlexItem--flexGrowZero"
                       >
                         <EuiButton
-                          color="primary"
                           fill={true}
-                          iconSide="left"
                           onClick={[MockFunction]}
-                          size="m"
-                          type="button"
                         >
                           <button
                             className="euiButton euiButton--primary euiButton--fill"
@@ -1007,9 +985,7 @@ exports[`UpgradeFailure component passes expected text for not new pipeline 1`]
                       >
                         <EuiButtonEmpty
                           color="primary"
-                          iconSide="left"
                           onClick={[MockFunction]}
-                          type="button"
                         >
                           <button
                             className="euiButtonEmpty euiButtonEmpty--primary"
diff --git a/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_actions.test.js.snap b/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_actions.test.js.snap
index f0a549a6928a6..2be92ef29e71b 100644
--- a/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_actions.test.js.snap
+++ b/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_actions.test.js.snap
@@ -8,12 +8,8 @@ exports[`UpgradeFailureActions component renders component as expected 1`] = `
     grow={false}
   >
     <EuiButton
-      color="primary"
       fill={true}
-      iconSide="left"
       onClick={[MockFunction]}
-      size="m"
-      type="button"
     >
       upgrade button text
     </EuiButton>
@@ -23,9 +19,7 @@ exports[`UpgradeFailureActions component renders component as expected 1`] = `
   >
     <EuiButtonEmpty
       color="primary"
-      iconSide="left"
       onClick={[MockFunction]}
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Go back"
diff --git a/x-pack/legacy/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap b/x-pack/legacy/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
index 92ddcabaf07a3..451d550789e4f 100644
--- a/x-pack/legacy/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
@@ -60,13 +60,9 @@ exports[`should not render relation select when geo field is geo_point 1`] = `
     />
   </EuiFormRow>
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     isDisabled={false}
     onClick={[Function]}
     size="s"
-    type="button"
   >
     Create filter
   </EuiButton>
@@ -162,13 +158,9 @@ exports[`should not show "within" relation when filter geometry is not closed 1`
     />
   </EuiFormRow>
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     isDisabled={false}
     onClick={[Function]}
     size="s"
-    type="button"
   >
     Create filter
   </EuiButton>
@@ -268,13 +260,9 @@ exports[`should render relation select when geo field is geo_shape 1`] = `
     />
   </EuiFormRow>
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     isDisabled={false}
     onClick={[Function]}
     size="s"
-    type="button"
   >
     Create filter
   </EuiButton>
diff --git a/x-pack/legacy/plugins/maps/public/components/__snapshots__/layer_toc_actions.test.js.snap b/x-pack/legacy/plugins/maps/public/components/__snapshots__/layer_toc_actions.test.js.snap
index 9bbca0ea39179..f2814625e45ba 100644
--- a/x-pack/legacy/plugins/maps/public/components/__snapshots__/layer_toc_actions.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/components/__snapshots__/layer_toc_actions.test.js.snap
@@ -28,10 +28,8 @@ exports[`LayerTocActions is rendered 1`] = `
         color="text"
         data-test-subj="layerTocActionsPanelToggleButtonlayer1"
         flush="left"
-        iconSide="left"
         onClick={[Function]}
         size="xs"
-        type="button"
       >
         <span
           className="mapTocEntry__layerNameIcon"
@@ -144,10 +142,8 @@ exports[`LayerTocActions should disable fit to data when supportsFitToBounds is
         color="text"
         data-test-subj="layerTocActionsPanelToggleButtonlayer1"
         flush="left"
-        iconSide="left"
         onClick={[Function]}
         size="xs"
-        type="button"
       >
         <span
           className="mapTocEntry__layerNameIcon"
@@ -260,10 +256,8 @@ exports[`LayerTocActions should not show edit actions in read only mode 1`] = `
         color="text"
         data-test-subj="layerTocActionsPanelToggleButtonlayer1"
         flush="left"
-        iconSide="left"
         onClick={[Function]}
         size="xs"
-        type="button"
       >
         <span
           className="mapTocEntry__layerNameIcon"
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
index 8ad795b32b3c3..49439fa9d64e6 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
@@ -19,11 +19,8 @@ exports[`LayerPanel is rendered 1`] = `
       >
         <EuiButtonIcon
           aria-label="Fit to bounds"
-          color="primary"
-          iconSize="m"
           iconType="vector"
           onClick={[Function]}
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Fit"
@@ -86,11 +83,7 @@ exports[`LayerPanel is rendered 1`] = `
       <LayerErrors />
       <LayerSettings />
       <SourceSettings />
-      <EuiPanel
-        grow={true}
-        hasShadow={false}
-        paddingSize="m"
-      >
+      <EuiPanel>
         <JoinEditor />
       </EuiPanel>
       <EuiSpacer
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/source_settings/__snapshots__/source_settings.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/source_settings/__snapshots__/source_settings.test.js.snap
index f1bc275380b6a..408037d347747 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/source_settings/__snapshots__/source_settings.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/source_settings/__snapshots__/source_settings.test.js.snap
@@ -2,11 +2,7 @@
 
 exports[`Should render source settings editor 1`] = `
 <Fragment>
-  <EuiPanel
-    grow={true}
-    hasShadow={false}
-    paddingSize="m"
-  >
+  <EuiPanel>
     <EuiFlexGroup>
       <EuiFlexItem>
         <EuiTitle
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_properties.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_properties.test.js.snap
index bdcc13a872b5e..d36402cd12768 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_properties.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_properties.test.js.snap
@@ -81,13 +81,10 @@ exports[`FeatureProperties should show only filter button for filterable propert
         <EuiButtonIcon
           aria-label="Filter on property"
           className="mapFeatureTooltip__filterButton"
-          color="primary"
           data-test-subj="mapTooltipCreateFilterButton"
-          iconSize="m"
           iconType="plusInCircle"
           onClick={[Function]}
           title="Filter on property"
-          type="button"
         />
       </td>
     </tr>
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_tooltip.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_tooltip.test.js.snap
index f274fb2c801eb..bd48b46f78fe0 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_tooltip.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/__snapshots__/feature_tooltip.test.js.snap
@@ -52,12 +52,9 @@ exports[`FeatureTooltip (multi) should show close button / should show count / s
     >
       <EuiButtonIcon
         aria-label="Close tooltip"
-        color="primary"
         data-test-subj="mapTooltipCloseButton"
-        iconSize="m"
         iconType="cross"
         onClick={[Function]}
-        type="button"
       />
     </EuiFlexItem>
   </EuiFlexGroup>
@@ -118,12 +115,9 @@ exports[`FeatureTooltip (multi) should show close button / should show count 1`]
     >
       <EuiButtonIcon
         aria-label="Close tooltip"
-        color="primary"
         data-test-subj="mapTooltipCloseButton"
-        iconSize="m"
         iconType="cross"
         onClick={[Function]}
-        type="button"
       />
     </EuiFlexItem>
   </EuiFlexGroup>
@@ -196,12 +190,9 @@ exports[`FeatureTooltip (single) should show close button 1`] = `
     >
       <EuiButtonIcon
         aria-label="Close tooltip"
-        color="primary"
         data-test-subj="mapTooltipCloseButton"
-        iconSize="m"
         iconType="cross"
         onClick={[Function]}
-        type="button"
       />
     </EuiFlexItem>
   </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.js.snap
index 203405dce7f57..a97e9f404a487 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.js.snap
@@ -12,11 +12,9 @@ exports[`Should render cancel button when drawing 1`] = `
           aria-label="Tools"
           className="mapToolbarOverlay__button"
           color="text"
-          iconSize="m"
           iconType="wrench"
           onClick={[Function]}
           title="Tools"
-          type="button"
         />
       }
       closePopover={[Function]}
@@ -95,12 +93,9 @@ exports[`Should render cancel button when drawing 1`] = `
   </EuiFlexItem>
   <EuiFlexItem>
     <EuiButton
-      color="primary"
       fill={true}
-      iconSide="left"
       onClick={[Function]}
       size="s"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Cancel"
@@ -120,11 +115,9 @@ exports[`renders 1`] = `
       aria-label="Tools"
       className="mapToolbarOverlay__button"
       color="text"
-      iconSize="m"
       iconType="wrench"
       onClick={[Function]}
       title="Tools"
-      type="button"
     />
   }
   closePopover={[Function]}
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/__snapshots__/view.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/__snapshots__/view.test.js.snap
index bc0890ed01cc1..fb352e9c2d9e3 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/__snapshots__/view.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/__snapshots__/view.test.js.snap
@@ -5,7 +5,6 @@ exports[`LayerControl is rendered 1`] = `
   <EuiPanel
     className="mapWidgetControl mapWidgetControl-hasShadow"
     grow={false}
-    hasShadow={false}
     paddingSize="none"
   >
     <EuiFlexItem
@@ -45,10 +44,8 @@ exports[`LayerControl is rendered 1`] = `
               className="mapLayerControl__closeLayerTOCButton"
               color="text"
               data-test-subj="mapToggleLegendButton"
-              iconSize="m"
               iconType="menuRight"
               onClick={[Function]}
-              type="button"
             />
           </EuiToolTip>
         </EuiFlexItem>
@@ -65,14 +62,10 @@ exports[`LayerControl is rendered 1`] = `
   />
   <EuiButton
     className="mapLayerControl__addLayerButton"
-    color="primary"
     data-test-subj="addLayerButton"
     fill={true}
     fullWidth={true}
-    iconSide="left"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add layer"
@@ -93,10 +86,8 @@ exports[`LayerControl props Should not render LayerTOC when isLayerTOCOpen is fa
     aria-label="Expand layers panel"
     className="mapLayerControl__openLayerTOCButton"
     color="text"
-    iconSize="m"
     iconType="menuLeft"
     onClick={[Function]}
-    type="button"
   />
 </EuiToolTip>
 `;
@@ -106,7 +97,6 @@ exports[`LayerControl props isReadOnly 1`] = `
   <EuiPanel
     className="mapWidgetControl mapWidgetControl-hasShadow"
     grow={false}
-    hasShadow={false}
     paddingSize="none"
   >
     <EuiFlexItem
@@ -146,10 +136,8 @@ exports[`LayerControl props isReadOnly 1`] = `
               className="mapLayerControl__closeLayerTOCButton"
               color="text"
               data-test-subj="mapToggleLegendButton"
-              iconSize="m"
               iconType="menuRight"
               onClick={[Function]}
-              type="button"
             />
           </EuiToolTip>
         </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/__snapshots__/view.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/__snapshots__/view.test.js.snap
index 2c8531c5c8030..80b51976dd8eb 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/__snapshots__/view.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/__snapshots__/view.test.js.snap
@@ -34,21 +34,16 @@ exports[`TOCEntry is rendered 1`] = `
     >
       <EuiButtonIcon
         aria-label="Edit layer"
-        color="primary"
-        iconSize="m"
         iconType="pencil"
         onClick={[Function]}
         title="Edit layer"
-        type="button"
       />
       <EuiButtonIcon
         aria-label="Reorder layer"
         className="mapTocEntry__grab"
         color="subdued"
-        iconSize="m"
         iconType="grab"
         title="Reorder layer"
-        type="button"
       />
     </div>
   </div>
@@ -155,21 +150,16 @@ exports[`TOCEntry props should display layer details when isLegendDetailsOpen is
     >
       <EuiButtonIcon
         aria-label="Edit layer"
-        color="primary"
-        iconSize="m"
         iconType="pencil"
         onClick={[Function]}
         title="Edit layer"
-        type="button"
       />
       <EuiButtonIcon
         aria-label="Reorder layer"
         className="mapTocEntry__grab"
         color="subdued"
-        iconSize="m"
         iconType="grab"
         title="Reorder layer"
-        type="button"
       />
     </div>
   </div>
diff --git a/x-pack/legacy/plugins/ml/public/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap b/x-pack/legacy/plugins/ml/public/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
index dfdc40df32808..0e14f0b402fb2 100644
--- a/x-pack/legacy/plugins/ml/public/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap
@@ -2,14 +2,10 @@
 
 exports[`FullTimeRangeSelector renders the selector 1`] = `
 <EuiButton
-  color="primary"
   data-test-subj="mlButtonUseFullData"
   fill={true}
-  iconSide="left"
   isDisabled={false}
   onClick={[Function]}
-  size="m"
-  type="button"
 >
   <FormattedMessage
     defaultMessage="Use full {indexPatternTitle} data"
diff --git a/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap b/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap
index 359ac25c58374..d11234001a664 100644
--- a/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap
@@ -202,11 +202,9 @@ exports[`ConditionExpression renders with appliesTo, operator and value supplied
     <EuiButtonIcon
       aria-label="Delete condition"
       color="danger"
-      iconSize="m"
       iconType="trash"
       onClick={[Function]}
       size="s"
-      type="button"
     />
   </EuiFlexItem>
 </EuiFlexGroup>
@@ -412,11 +410,9 @@ exports[`ConditionExpression renders with only value supplied 1`] = `
     <EuiButtonIcon
       aria-label="Delete condition"
       color="danger"
-      iconSize="m"
       iconType="trash"
       onClick={[Function]}
       size="s"
-      type="button"
     />
   </EuiFlexItem>
 </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/conditions_section.test.js.snap b/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/conditions_section.test.js.snap
index 839a18efdb67c..da9a3c7437bf4 100644
--- a/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/conditions_section.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/conditions_section.test.js.snap
@@ -10,10 +10,7 @@ exports[`ConditionsSectionExpression renders when enabled with empty conditions
     size="s"
   />
   <EuiButtonEmpty
-    color="primary"
-    iconSide="left"
     onClick={[Function]}
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add new condition"
@@ -30,10 +27,7 @@ exports[`ConditionsSectionExpression renders when enabled with no conditions sup
     size="s"
   />
   <EuiButtonEmpty
-    color="primary"
-    iconSide="left"
     onClick={[Function]}
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add new condition"
@@ -59,10 +53,7 @@ exports[`ConditionsSectionExpression renders when enabled with one condition 1`]
     size="s"
   />
   <EuiButtonEmpty
-    color="primary"
-    iconSide="left"
     onClick={[Function]}
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add new condition"
@@ -97,10 +88,7 @@ exports[`ConditionsSectionExpression renders when enabled with two conditions 1`
     size="s"
   />
   <EuiButtonEmpty
-    color="primary"
-    iconSide="left"
     onClick={[Function]}
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add new condition"
diff --git a/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap b/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
index 2c5eaff3e0e34..b78f0b0fa2cca 100644
--- a/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
@@ -225,12 +225,9 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
             flush="left"
-            iconSide="left"
             iconType="cross"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Close"
@@ -243,13 +240,9 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule
           grow={false}
         >
           <EuiButton
-            color="primary"
             fill={true}
-            iconSide="left"
             isDisabled={false}
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -499,12 +492,9 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`]
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
             flush="left"
-            iconSide="left"
             iconType="cross"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Close"
@@ -517,13 +507,9 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`]
           grow={false}
         >
           <EuiButton
-            color="primary"
             fill={true}
-            iconSide="left"
             isDisabled={false}
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -751,12 +737,9 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
             flush="left"
-            iconSide="left"
             iconType="cross"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Close"
@@ -769,13 +752,9 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions
           grow={false}
         >
           <EuiButton
-            color="primary"
             fill={true}
-            iconSide="left"
             isDisabled={true}
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -881,12 +860,9 @@ exports[`RuleEditorFlyout renders the select action component for a detector wit
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
             flush="left"
-            iconSide="left"
             iconType="cross"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Close"
diff --git a/x-pack/legacy/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap b/x-pack/legacy/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap
index d14ee26276d67..6e00713ebb892 100644
--- a/x-pack/legacy/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap
@@ -3,8 +3,6 @@
 exports[`RuleActionPanel renders panel for rule with a condition 1`] = `
 <EuiPanel
   className="select-rule-action-panel"
-  grow={true}
-  hasShadow={false}
   paddingSize="m"
 >
   <EuiDescriptionList
@@ -75,8 +73,6 @@ exports[`RuleActionPanel renders panel for rule with a condition 1`] = `
 exports[`RuleActionPanel renders panel for rule with a condition and scope, value not in filter list 1`] = `
 <EuiPanel
   className="select-rule-action-panel"
-  grow={true}
-  hasShadow={false}
   paddingSize="m"
 >
   <EuiDescriptionList
@@ -129,8 +125,6 @@ exports[`RuleActionPanel renders panel for rule with a condition and scope, valu
 exports[`RuleActionPanel renders panel for rule with scope, value in filter list 1`] = `
 <EuiPanel
   className="select-rule-action-panel"
-  grow={true}
-  hasShadow={false}
   paddingSize="m"
 >
   <EuiDescriptionList
diff --git a/x-pack/legacy/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap b/x-pack/legacy/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap
index 2eda2462a6aed..8e8e0264060e7 100644
--- a/x-pack/legacy/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap
@@ -4,7 +4,6 @@ exports[`ValidateJob renders button and modal with a message 1`] = `
 <Fragment>
   <div>
     <EuiButton
-      color="primary"
       fill={true}
       iconSide="right"
       iconType="questionInCircle"
@@ -12,7 +11,6 @@ exports[`ValidateJob renders button and modal with a message 1`] = `
       isLoading={false}
       onClick={[Function]}
       size="s"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Validate Job"
@@ -84,7 +82,6 @@ exports[`ValidateJob renders the button 1`] = `
 <Fragment>
   <div>
     <EuiButton
-      color="primary"
       fill={true}
       iconSide="right"
       iconType="questionInCircle"
@@ -92,7 +89,6 @@ exports[`ValidateJob renders the button 1`] = `
       isLoading={false}
       onClick={[Function]}
       size="s"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Validate Job"
@@ -108,7 +104,6 @@ exports[`ValidateJob renders the button and modal with a success message 1`] = `
 <Fragment>
   <div>
     <EuiButton
-      color="primary"
       fill={true}
       iconSide="right"
       iconType="questionInCircle"
@@ -116,7 +111,6 @@ exports[`ValidateJob renders the button and modal with a success message 1`] = `
       isLoading={false}
       onClick={[Function]}
       size="s"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Validate Job"
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/agg_label_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/agg_label_form.test.tsx.snap
index 386f6ea47c50b..0ff0c497a5580 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/agg_label_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/agg_label_form.test.tsx.snap
@@ -24,12 +24,9 @@ exports[`Data Frame: <AggLabelForm /> Date histogram aggregation 1`] = `
       button={
         <EuiButtonIcon
           aria-label="Edit aggregation"
-          color="primary"
-          iconSize="m"
           iconType="pencil"
           onClick={[Function]}
           size="s"
-          type="button"
         />
       }
       closePopover={[Function]}
@@ -61,12 +58,9 @@ exports[`Data Frame: <AggLabelForm /> Date histogram aggregation 1`] = `
   >
     <EuiButtonIcon
       aria-label="Delete item"
-      color="primary"
-      iconSize="m"
       iconType="cross"
       onClick={[Function]}
       size="s"
-      type="button"
     />
   </EuiFlexItem>
 </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_form.test.tsx.snap
index 9e7244826565e..01c9f83a47fc5 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_form.test.tsx.snap
@@ -3,8 +3,6 @@
 exports[`Data Frame: <AggListForm /> Minimal initialization 1`] = `
 <Fragment>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="s"
   >
     <AggLabelForm
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_summary.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_summary.test.tsx.snap
index ede0c9649c2ec..08eed9b0c282f 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_summary.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/list_summary.test.tsx.snap
@@ -3,8 +3,6 @@
 exports[`Data Frame: <AggListSummary /> Minimal initialization 1`] = `
 <EuiForm>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="s"
   >
     <div
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap
index 46ed0ef16b8f5..e387b0e93d799 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/aggregation_list/__snapshots__/popover_form.test.tsx.snap
@@ -34,13 +34,8 @@ exports[`Data Frame: Aggregation <PopoverForm /> Minimal initialization 1`] = `
     labelType="label"
   >
     <EuiButton
-      color="primary"
-      fill={false}
-      iconSide="left"
       isDisabled={false}
       onClick={[Function]}
-      size="m"
-      type="button"
     >
       Apply
     </EuiButton>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/group_by_label_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/group_by_label_form.test.tsx.snap
index 92e36de054e69..cc1957ce543a2 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/group_by_label_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/group_by_label_form.test.tsx.snap
@@ -35,12 +35,9 @@ exports[`Data Frame: <GroupByLabelForm /> Date histogram aggregation 1`] = `
       button={
         <EuiButtonIcon
           aria-label="Edit interval"
-          color="primary"
-          iconSize="m"
           iconType="pencil"
           onClick={[Function]}
           size="s"
-          type="button"
         />
       }
       closePopover={[Function]}
@@ -73,12 +70,9 @@ exports[`Data Frame: <GroupByLabelForm /> Date histogram aggregation 1`] = `
   >
     <EuiButtonIcon
       aria-label="Delete item"
-      color="primary"
-      iconSize="m"
       iconType="cross"
       onClick={[Function]}
       size="s"
-      type="button"
     />
   </EuiFlexItem>
 </EuiFlexGroup>
@@ -119,12 +113,9 @@ exports[`Data Frame: <GroupByLabelForm /> Histogram aggregation 1`] = `
       button={
         <EuiButtonIcon
           aria-label="Edit interval"
-          color="primary"
-          iconSize="m"
           iconType="pencil"
           onClick={[Function]}
           size="s"
-          type="button"
         />
       }
       closePopover={[Function]}
@@ -157,12 +148,9 @@ exports[`Data Frame: <GroupByLabelForm /> Histogram aggregation 1`] = `
   >
     <EuiButtonIcon
       aria-label="Delete item"
-      color="primary"
-      iconSize="m"
       iconType="cross"
       onClick={[Function]}
       size="s"
-      type="button"
     />
   </EuiFlexItem>
 </EuiFlexGroup>
@@ -192,12 +180,9 @@ exports[`Data Frame: <GroupByLabelForm /> Terms aggregation 1`] = `
       button={
         <EuiButtonIcon
           aria-label="Edit interval"
-          color="primary"
-          iconSize="m"
           iconType="pencil"
           onClick={[Function]}
           size="s"
-          type="button"
         />
       }
       closePopover={[Function]}
@@ -229,12 +214,9 @@ exports[`Data Frame: <GroupByLabelForm /> Terms aggregation 1`] = `
   >
     <EuiButtonIcon
       aria-label="Delete item"
-      color="primary"
-      iconSize="m"
       iconType="cross"
       onClick={[Function]}
       size="s"
-      type="button"
     />
   </EuiFlexItem>
 </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_form.test.tsx.snap
index e242eda727a13..c9643702b5339 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_form.test.tsx.snap
@@ -3,8 +3,6 @@
 exports[`Data Frame: <GroupByListForm /> Minimal initialization 1`] = `
 <Fragment>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="s"
   >
     <GroupByLabelForm
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_summary.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_summary.test.tsx.snap
index 508d7af56f5c1..ebe94a4abe805 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_summary.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/list_summary.test.tsx.snap
@@ -3,8 +3,6 @@
 exports[`Data Frame: <GroupByListSummary /> Minimal initialization 1`] = `
 <Fragment>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="s"
   >
     <GroupByLabelSummary
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/popover_form.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/popover_form.test.tsx.snap
index c4d3264adadd4..c3a0432c4acf2 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/popover_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/components/group_by_list/__snapshots__/popover_form.test.tsx.snap
@@ -84,13 +84,8 @@ exports[`Data Frame: Group By <PopoverForm /> Minimal initialization 1`] = `
     labelType="label"
   >
     <EuiButton
-      color="primary"
-      fill={false}
-      iconSide="left"
       isDisabled={false}
       onClick={[Function]}
-      size="m"
-      type="button"
     >
       Apply
     </EuiButton>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/__snapshots__/page.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/__snapshots__/page.test.tsx.snap
index dc16e6843ba91..370d8b9ab685e 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/__snapshots__/page.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/__snapshots__/page.test.tsx.snap
@@ -60,11 +60,7 @@ exports[`Data Frame: Job List <Page /> Minimal initialization 1`] = `
         <EuiSpacer
           size="l"
         />
-        <EuiPanel
-          grow={true}
-          hasShadow={false}
-          paddingSize="m"
-        >
+        <EuiPanel>
           <DataFrameTransformList
             isInitialized={false}
             transforms={Array []}
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/create_transform_button/__snapshots__/create_transform_button.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/create_transform_button/__snapshots__/create_transform_button.test.tsx.snap
index 01472d5770c00..bc20f0aec255f 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/create_transform_button/__snapshots__/create_transform_button.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/create_transform_button/__snapshots__/create_transform_button.test.tsx.snap
@@ -7,15 +7,12 @@ exports[`Data Frame: Transform List <CreateTransformButton /> Minimal initializa
   position="top"
 >
   <EuiButton
-    color="primary"
     data-test-subj="mlDataFramesButtonCreate"
     disabled={true}
     fill={true}
-    iconSide="left"
     iconType="plusInCircle"
     onClick={[Function]}
     size="s"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Create transform"
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_delete.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_delete.test.tsx.snap
index c165475d8fbbb..736559eb63cf5 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_delete.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_delete.test.tsx.snap
@@ -11,11 +11,9 @@ exports[`Data Frame: Transform List Actions <DeleteAction /> Minimal initializat
       aria-label="Delete"
       color="text"
       disabled={true}
-      iconSide="left"
       iconType="trash"
       onClick={[Function]}
       size="xs"
-      type="button"
     >
       Delete
     </EuiButtonEmpty>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_start.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_start.test.tsx.snap
index ee81779f47ac8..3e6cf9368e23f 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_start.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_start.test.tsx.snap
@@ -11,11 +11,9 @@ exports[`Data Frame: Transform List Actions <StartAction /> Minimal initializati
       aria-label="Start"
       color="text"
       disabled={true}
-      iconSide="left"
       iconType="play"
       onClick={[Function]}
       size="xs"
-      type="button"
     >
       Start
     </EuiButtonEmpty>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_stop.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_stop.test.tsx.snap
index 606204bfaa387..d8b0b088580f7 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_stop.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/action_stop.test.tsx.snap
@@ -10,11 +10,9 @@ exports[`Data Frame: Transform List Actions <StopAction /> Minimal initializatio
     aria-label="Stop"
     color="text"
     disabled={true}
-    iconSide="left"
     iconType="stop"
     onClick={[Function]}
     size="xs"
-    type="button"
   >
     Stop
   </EuiButtonEmpty>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/expanded_row_details_pane.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/expanded_row_details_pane.test.tsx.snap
index 88f1d20f119e8..3fee6229a71aa 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/expanded_row_details_pane.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/expanded_row_details_pane.test.tsx.snap
@@ -38,11 +38,7 @@ exports[`Data Frame: Job List Expanded Row <ExpandedRowDetailsPane /> Minimal in
 `;
 
 exports[`Data Frame: Job List Expanded Row <Section /> Minimal initialization 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiTitle
     size="xs"
   >
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
index dd3763d054b14..25e332f71404a 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
@@ -9,11 +9,8 @@ exports[`Data Frame: Transform List <DataFrameTransformList /> Minimal initializ
     actions={
       Array [
         <EuiButtonEmpty
-          color="primary"
-          iconSide="left"
           isDisabled={true}
           onClick={[Function]}
-          type="button"
         >
           Create your first data frame transform
         </EuiButtonEmpty>,
diff --git a/x-pack/legacy/plugins/ml/public/explorer/components/explorer_no_jobs_found/__snapshots__/explorer_no_jobs_found.test.js.snap b/x-pack/legacy/plugins/ml/public/explorer/components/explorer_no_jobs_found/__snapshots__/explorer_no_jobs_found.test.js.snap
index 618cda456332c..3d143bda7140e 100644
--- a/x-pack/legacy/plugins/ml/public/explorer/components/explorer_no_jobs_found/__snapshots__/explorer_no_jobs_found.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/explorer/components/explorer_no_jobs_found/__snapshots__/explorer_no_jobs_found.test.js.snap
@@ -7,9 +7,6 @@ exports[`ExplorerNoInfluencersFound snapshot 1`] = `
       color="primary"
       fill={true}
       href="ml#/jobs"
-      iconSide="left"
-      size="m"
-      type="button"
     >
       <FormattedMessage
         defaultMessage="Create new job"
diff --git a/x-pack/legacy/plugins/ml/public/jobs/components/custom_url_editor/__snapshots__/list.test.js.snap b/x-pack/legacy/plugins/ml/public/jobs/components/custom_url_editor/__snapshots__/list.test.js.snap
index 4966443d248c2..f4211050ebb26 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/components/custom_url_editor/__snapshots__/list.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/jobs/components/custom_url_editor/__snapshots__/list.test.js.snap
@@ -108,11 +108,9 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
           <EuiButtonIcon
             aria-label="Test custom URL"
             color="primary"
-            iconSize="m"
             iconType="popout"
             onClick={[Function]}
             size="s"
-            type="button"
           />
         </EuiToolTip>
       </EuiFormRow>
@@ -140,11 +138,9 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
           <EuiButtonIcon
             aria-label="Delete custom URL"
             color="danger"
-            iconSize="m"
             iconType="trash"
             onClick={[Function]}
             size="s"
-            type="button"
           />
         </EuiToolTip>
       </EuiFormRow>
@@ -256,11 +252,9 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
           <EuiButtonIcon
             aria-label="Test custom URL"
             color="primary"
-            iconSize="m"
             iconType="popout"
             onClick={[Function]}
             size="s"
-            type="button"
           />
         </EuiToolTip>
       </EuiFormRow>
@@ -288,11 +282,9 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
           <EuiButtonIcon
             aria-label="Delete custom URL"
             color="danger"
-            iconSize="m"
             iconType="trash"
             onClick={[Function]}
             size="s"
-            type="button"
           />
         </EuiToolTip>
       </EuiFormRow>
@@ -404,11 +396,9 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
           <EuiButtonIcon
             aria-label="Test custom URL"
             color="primary"
-            iconSize="m"
             iconType="popout"
             onClick={[Function]}
             size="s"
-            type="button"
           />
         </EuiToolTip>
       </EuiFormRow>
@@ -436,11 +426,9 @@ exports[`CustomUrlList renders a list of custom URLs 1`] = `
           <EuiButtonIcon
             aria-label="Delete custom URL"
             color="danger"
-            iconSize="m"
             iconType="trash"
             onClick={[Function]}
             size="s"
-            type="button"
           />
         </EuiToolTip>
       </EuiFormRow>
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap b/x-pack/legacy/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap
index 4a08454e2f486..8b377c95f56cc 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap
@@ -16,14 +16,12 @@ exports[`BucketSpanEstimator renders the button 1`] = `
     position="bottom"
   >
     <EuiButton
-      color="primary"
       disabled={false}
       fill={true}
       iconSide="right"
       isLoading={false}
       onClick={[Function]}
       size="s"
-      type="button"
     >
       Estimate bucket span
     </EuiButton>
@@ -47,14 +45,12 @@ exports[`BucketSpanEstimator renders the loading button 1`] = `
     position="bottom"
   >
     <EuiButton
-      color="primary"
       disabled={true}
       fill={true}
       iconSide="right"
       isLoading={true}
       onClick={[Function]}
       size="s"
-      type="button"
     >
       Estimating bucket span
     </EuiButton>
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
index b89055da055bb..0afcd7081a4d0 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
@@ -171,14 +171,10 @@ exports[`CalendarForm Renders calendar form 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
         data-testid="ml_save_calendar_button"
         fill={true}
-        iconSide="left"
         isDisabled={true}
         onClick={[MockFunction]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Save"
@@ -191,13 +187,8 @@ exports[`CalendarForm Renders calendar form 1`] = `
       grow={false}
     >
       <EuiButton
-        color="primary"
-        fill={false}
         href="undefined/app/ml#/settings/calendars_list"
-        iconSide="left"
         isDisabled={false}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel"
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
index 9630becbe6f72..605602053582f 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
@@ -132,15 +132,11 @@ exports[`EventsTable Renders events table with search bar 1`] = `
         "filters": Array [],
         "toolsRight": Array [
           <EuiButton
-            color="primary"
             data-testid="ml_new_event"
-            fill={false}
-            iconSide="left"
             iconType="plusInCircle"
             isDisabled={false}
             onClick={[MockFunction]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="New event"
@@ -149,15 +145,11 @@ exports[`EventsTable Renders events table with search bar 1`] = `
             />
           </EuiButton>,
           <EuiButton
-            color="primary"
             data-testid="ml_import_events"
-            fill={false}
-            iconSide="left"
             iconType="importAction"
             isDisabled={false}
             onClick={[MockFunction]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Import events"
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
index ce0f62b585f20..bc68c71314594 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
@@ -54,10 +54,7 @@ exports[`ImportModal Renders import modal 1`] = `
     </EuiModalBody>
     <EuiModalFooter>
       <EuiButtonEmpty
-        color="primary"
-        iconSide="left"
         onClick={[MockFunction]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel"
@@ -66,13 +63,9 @@ exports[`ImportModal Renders import modal 1`] = `
         />
       </EuiButtonEmpty>
       <EuiButton
-        color="primary"
         disabled={true}
         fill={true}
-        iconSide="left"
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Import"
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/list/__snapshots__/header.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/calendars/list/__snapshots__/header.test.js.snap
index 6914a592a8056..166f277fc3701 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/list/__snapshots__/header.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/list/__snapshots__/header.test.js.snap
@@ -60,12 +60,9 @@ exports[`CalendarListsHeader renders header 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             iconType="refresh"
             onClick={[MockFunction]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Refresh"
diff --git a/x-pack/legacy/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap
index 7b608c4c4c093..1932ff3d83efa 100644
--- a/x-pack/legacy/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/calendars/list/table/__snapshots__/table.test.js.snap
@@ -69,14 +69,10 @@ exports[`CalendarsListTable renders the table with all calendars 1`] = `
         "filters": Array [],
         "toolsRight": Array [
           <EuiButton
-            color="primary"
             data-test-subj="mlCalendarButtonCreate"
-            fill={false}
             href="undefined/app/ml#/settings/calendars_list/new_calendar"
-            iconSide="left"
             isDisabled={false}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="New"
@@ -86,13 +82,10 @@ exports[`CalendarsListTable renders the table with all calendars 1`] = `
           </EuiButton>,
           <EuiButton
             color="danger"
-            fill={false}
-            iconSide="left"
             iconType="trash"
             isDisabled={true}
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Delete"
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
index 2dcc56d747520..1517f2e40276d 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
@@ -7,13 +7,11 @@ exports[`AddItemPopover calls addItems with multiple items on clicking Add butto
     button={
       <EuiButton
         color="primary"
-        fill={false}
         iconSide="right"
         iconType="arrowDown"
         isDisabled={false}
         onClick={[Function]}
         size="s"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Add item"
@@ -72,13 +70,8 @@ exports[`AddItemPopover calls addItems with multiple items on clicking Add butto
         grow={false}
       >
         <EuiButton
-          color="primary"
           disabled={true}
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Add"
@@ -99,13 +92,11 @@ exports[`AddItemPopover opens the popover onButtonClick 1`] = `
     button={
       <EuiButton
         color="primary"
-        fill={false}
         iconSide="right"
         iconType="arrowDown"
         isDisabled={false}
         onClick={[Function]}
         size="s"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Add item"
@@ -164,13 +155,8 @@ exports[`AddItemPopover opens the popover onButtonClick 1`] = `
         grow={false}
       >
         <EuiButton
-          color="primary"
           disabled={true}
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Add"
@@ -191,13 +177,11 @@ exports[`AddItemPopover renders the popover 1`] = `
     button={
       <EuiButton
         color="primary"
-        fill={false}
         iconSide="right"
         iconType="arrowDown"
         isDisabled={false}
         onClick={[Function]}
         size="s"
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Add item"
@@ -256,13 +240,8 @@ exports[`AddItemPopover renders the popover 1`] = `
         grow={false}
       >
         <EuiButton
-          color="primary"
           disabled={true}
-          fill={false}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Add"
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
index 1990c5167f5ce..c7c7b7dd9858b 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
@@ -4,14 +4,10 @@ exports[`DeleteFilterListModal false canDeleteFilter privilege renders as disabl
 <div>
   <EuiButton
     color="danger"
-    fill={false}
-    iconSide="left"
     iconType="trash"
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -26,14 +22,10 @@ exports[`DeleteFilterListModal renders as delete button after opening and closin
 <div>
   <EuiButton
     color="danger"
-    fill={false}
-    iconSide="left"
     iconType="trash"
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -48,14 +40,10 @@ exports[`DeleteFilterListModal renders as disabled delete button when no lists s
 <div>
   <EuiButton
     color="danger"
-    fill={false}
-    iconSide="left"
     iconType="trash"
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -70,14 +58,10 @@ exports[`DeleteFilterListModal renders as enabled delete button when a list is s
 <div>
   <EuiButton
     color="danger"
-    fill={false}
-    iconSide="left"
     iconType="trash"
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Delete"
@@ -92,14 +76,10 @@ exports[`DeleteFilterListModal renders modal after clicking delete button 1`] =
 <div>
   <EuiButton
     color="danger"
-    fill={false}
-    iconSide="left"
     iconType="trash"
     isDisabled={false}
     key="delete_filter_list"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Delete"
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap
index 4c5ea7d2d5000..f3eb500239094 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/edit_description_popover/__snapshots__/edit_description_popover.test.js.snap
@@ -8,12 +8,10 @@ exports[`FilterListUsagePopover opens the popover onButtonClick 1`] = `
       <EuiButtonIcon
         aria-label="Edit description"
         color="primary"
-        iconSize="m"
         iconType="pencil"
         isDisabled={false}
         onClick={[Function]}
         size="s"
-        type="button"
       />
     }
     closePopover={[Function]}
@@ -68,12 +66,10 @@ exports[`FilterListUsagePopover renders the popover with a description 1`] = `
       <EuiButtonIcon
         aria-label="Edit description"
         color="primary"
-        iconSize="m"
         iconType="pencil"
         isDisabled={false}
         onClick={[Function]}
         size="s"
-        type="button"
       />
     }
     closePopover={[Function]}
@@ -128,12 +124,10 @@ exports[`FilterListUsagePopover renders the popover with no description 1`] = `
       <EuiButtonIcon
         aria-label="Edit description"
         color="primary"
-        iconSize="m"
         iconType="pencil"
         isDisabled={false}
         onClick={[Function]}
         size="s"
-        type="button"
       />
     }
     closePopover={[Function]}
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/filter_list_usage_popover/__snapshots__/filter_list_usage_popover.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/filter_list_usage_popover/__snapshots__/filter_list_usage_popover.test.js.snap
index 79bcb74d37098..8757eedb6289a 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/filter_list_usage_popover/__snapshots__/filter_list_usage_popover.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/components/filter_list_usage_popover/__snapshots__/filter_list_usage_popover.test.js.snap
@@ -7,10 +7,8 @@ exports[`FilterListUsagePopover opens the popover onButtonClick 1`] = `
     button={
       <EuiButtonEmpty
         color="primary"
-        iconSide="left"
         onClick={[Function]}
         size="s"
-        type="button"
       >
         3 detectors
       </EuiButtonEmpty>
@@ -52,10 +50,8 @@ exports[`FilterListUsagePopover renders the popover for 1 job 1`] = `
     button={
       <EuiButtonEmpty
         color="primary"
-        iconSide="left"
         onClick={[Function]}
         size="s"
-        type="button"
       >
         1 job
       </EuiButtonEmpty>
@@ -87,10 +83,8 @@ exports[`FilterListUsagePopover renders the popover for 2 detectors 1`] = `
     button={
       <EuiButtonEmpty
         color="primary"
-        iconSide="left"
         onClick={[Function]}
         size="s"
-        type="button"
       >
         3 detectors
       </EuiButtonEmpty>
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
index e19c61350f8c7..f5149bf857adc 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
@@ -80,10 +80,7 @@ exports[`EditFilterList adds new items to filter list 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -96,13 +93,9 @@ exports[`EditFilterList adds new items to filter list 1`] = `
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={false}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -199,10 +192,7 @@ exports[`EditFilterList renders after selecting an item and deleting it 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -215,13 +205,9 @@ exports[`EditFilterList renders after selecting an item and deleting it 1`] = `
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={false}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -313,10 +299,7 @@ exports[`EditFilterList renders after selecting an item and deleting it 2`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -329,13 +312,9 @@ exports[`EditFilterList renders after selecting an item and deleting it 2`] = `
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={false}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -411,10 +390,7 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -427,13 +403,9 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={true}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -509,10 +481,7 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -525,13 +494,9 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={false}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -624,10 +589,7 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -640,13 +602,9 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={false}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -739,10 +697,7 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -755,13 +710,9 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={false}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
@@ -854,10 +805,7 @@ exports[`EditFilterList updates the items per page 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -870,13 +818,9 @@ exports[`EditFilterList updates the items per page 1`] = `
           grow={false}
         >
           <EuiButton
-            color="primary"
             disabled={false}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Save"
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/toolbar.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/toolbar.test.js.snap
index 701ee1ae72364..9a6e8c756fb85 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/toolbar.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/edit/__snapshots__/toolbar.test.js.snap
@@ -19,11 +19,8 @@ exports[`EditFilterListToolbar renders the toolbar with no items selected 1`] =
             <EuiButton
               color="danger"
               disabled={true}
-              fill={false}
-              iconSide="left"
               onClick={[MockFunction]}
               size="s"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Delete item"
@@ -58,11 +55,8 @@ exports[`EditFilterListToolbar renders the toolbar with one item selected 1`] =
             <EuiButton
               color="danger"
               disabled={false}
-              fill={false}
-              iconSide="left"
               onClick={[MockFunction]}
               size="s"
-              type="button"
             >
               <FormattedMessage
                 defaultMessage="Delete item"
diff --git a/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/__snapshots__/header.test.js.snap b/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/__snapshots__/header.test.js.snap
index 579e2b90378e4..34636e2364c86 100644
--- a/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/__snapshots__/header.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/settings/filter_lists/list/__snapshots__/header.test.js.snap
@@ -60,12 +60,9 @@ exports[`Filter Lists Header renders header 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
-            iconSide="left"
             iconType="refresh"
             onClick={[Function]}
             size="s"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Refresh"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
index 21f909e9d73d5..905e2d180efd5 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
@@ -17,11 +17,7 @@ exports[`Overview that overview page renders normally 1`] = `
         wrap={true}
       >
         <EuiFlexItem>
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <EuiTitle
               size="s"
             >
@@ -65,11 +61,7 @@ exports[`Overview that overview page renders normally 1`] = `
           </EuiPanel>
         </EuiFlexItem>
         <EuiFlexItem>
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <EuiTitle
               size="s"
             >
@@ -105,11 +97,7 @@ exports[`Overview that overview page renders normally 1`] = `
           </EuiPanel>
         </EuiFlexItem>
         <EuiFlexItem>
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <EuiTitle
               size="s"
             >
@@ -155,11 +143,7 @@ exports[`Overview that overview page renders normally 1`] = `
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
@@ -173,11 +157,7 @@ exports[`Overview that overview page renders normally 1`] = `
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
@@ -191,11 +171,7 @@ exports[`Overview that overview page renders normally 1`] = `
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
@@ -209,11 +185,7 @@ exports[`Overview that overview page renders normally 1`] = `
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
@@ -259,11 +231,7 @@ exports[`Overview that overview page shows a message if there is no beats data 1
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
@@ -277,11 +245,7 @@ exports[`Overview that overview page shows a message if there is no beats data 1
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
@@ -295,11 +259,7 @@ exports[`Overview that overview page shows a message if there is no beats data 1
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
@@ -313,11 +273,7 @@ exports[`Overview that overview page shows a message if there is no beats data 1
             }
           }
         >
-          <EuiPanel
-            grow={true}
-            hasShadow={false}
-            paddingSize="m"
-          >
+          <EuiPanel>
             <MonitoringTimeseriesContainer
               series={1}
             />
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
index 6c3c11979a465..4bab93d794e0b 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
@@ -1,11 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CcrShard that is renders an exception properly 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiTitle
     color="danger"
     size="s"
@@ -115,11 +111,7 @@ exports[`CcrShard that it renders normally 1`] = `
           }
         }
       >
-        <EuiPanel
-          grow={true}
-          hasShadow={false}
-          paddingSize="m"
-        >
+        <EuiPanel>
           <MonitoringTimeseriesContainer />
         </EuiPanel>
       </EuiFlexItem>
@@ -131,11 +123,7 @@ exports[`CcrShard that it renders normally 1`] = `
           }
         }
       >
-        <EuiPanel
-          grow={true}
-          hasShadow={false}
-          paddingSize="m"
-        >
+        <EuiPanel>
           <MonitoringTimeseriesContainer />
         </EuiPanel>
       </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/collapsible_statement.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/collapsible_statement.test.js.snap
index 4e8f92f5fd965..7a5f8e89e8620 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/collapsible_statement.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/collapsible_statement.test.js.snap
@@ -14,11 +14,9 @@ exports[`CollapsibleStatement component renders child components 1`] = `
     <EuiButtonIcon
       aria-label="collapse"
       color="text"
-      iconSize="m"
       iconType="arrowDown"
       onClick={[Function]}
       size="s"
-      type="button"
     />
   </EuiFlexItem>
   <div>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/detail_drawer.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/detail_drawer.test.js.snap
index 424ec08c24ac6..e35bb6970bcf9 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/detail_drawer.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/detail_drawer.test.js.snap
@@ -111,37 +111,19 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
         </EuiCodeBlock>
         <EuiSpacer />
       </div>
-      <EuiTable
-        responsive={true}
-      >
+      <EuiTable>
         <EuiTableBody>
           <EuiTableRow
             key="events_latency"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Latency"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsLatencyLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -176,45 +158,21 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               0.23 ms/e
             </EuiTableRowCell>
           </EuiTableRow>
           <EuiTableRow
             key="events_out_rate"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Emitted Rate"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsEmittedRateLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -249,45 +207,21 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               N/A
             </EuiTableRowCell>
           </EuiTableRow>
           <EuiTableRow
             key="events_in"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Received"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsReceivedLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -322,45 +256,21 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               203 events
             </EuiTableRowCell>
           </EuiTableRow>
           <EuiTableRow
             key="events_out"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Emitted"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsEmittedLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -395,15 +305,7 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               200 events
             </EuiTableRowCell>
           </EuiTableRow>
@@ -460,37 +362,19 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
           }
         />
       </p>
-      <EuiTable
-        responsive={true}
-      >
+      <EuiTable>
         <EuiTableBody>
           <EuiTableRow
             key="events_latency"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Latency"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsLatencyLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -525,45 +409,21 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               0.23 ms/e
             </EuiTableRowCell>
           </EuiTableRow>
           <EuiTableRow
             key="events_out_rate"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Emitted Rate"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsEmittedRateLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -598,45 +458,21 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               N/A
             </EuiTableRowCell>
           </EuiTableRow>
           <EuiTableRow
             key="events_in"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Received"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsReceivedLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -671,45 +507,21 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               203 events
             </EuiTableRowCell>
           </EuiTableRow>
           <EuiTableRow
             key="events_out"
           >
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <FormattedMessage
                 defaultMessage="Events Emitted"
                 id="xpack.monitoring.logstash.pipeline.detailDrawer.eventsEmittedLabel"
                 values={Object {}}
               />
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               <div
                 className="lspvDetailDrawerSparklineContainer"
               >
@@ -744,15 +556,7 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
                 />
               </div>
             </EuiTableRowCell>
-            <EuiTableRowCell
-              align="left"
-              mobileOptions={
-                Object {
-                  "show": true,
-                }
-              }
-              textOnly={true}
-            >
+            <EuiTableRowCell>
               200 events
             </EuiTableRowCell>
           </EuiTableRow>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/plugin_statement.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/plugin_statement.test.js.snap
index e87b1f0833ea6..db95a2bca5119 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/plugin_statement.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/plugin_statement.test.js.snap
@@ -23,11 +23,9 @@ exports[`PluginStatement component adds warning highlight for cpu time 1`] = `
           className="monPipelineViewer__plugin"
           color="primary"
           flush="left"
-          iconSide="left"
           iconType="dot"
           onClick={[Function]}
           size="xs"
-          type="button"
         >
           <span>
             mutate
@@ -97,11 +95,9 @@ exports[`PluginStatement component adds warning highlight for event millis 1`] =
           className="monPipelineViewer__plugin"
           color="primary"
           flush="left"
-          iconSide="left"
           iconType="dot"
           onClick={[Function]}
           size="xs"
-          type="button"
         >
           <span>
             mutate
@@ -171,11 +167,9 @@ exports[`PluginStatement component does not render explicit id field if no id is
           className="monPipelineViewer__plugin"
           color="primary"
           flush="left"
-          iconSide="left"
           iconType="dot"
           onClick={[Function]}
           size="xs"
-          type="button"
         >
           <span>
             stdin
@@ -223,11 +217,9 @@ exports[`PluginStatement component renders input metrics and explicit id fields
           className="monPipelineViewer__plugin"
           color="primary"
           flush="left"
-          iconSide="left"
           iconType="dot"
           onClick={[Function]}
           size="xs"
-          type="button"
         >
           <span>
             stdin
@@ -285,11 +277,9 @@ exports[`PluginStatement component renders processor statement metrics 1`] = `
           className="monPipelineViewer__plugin"
           color="primary"
           flush="left"
-          iconSide="left"
           iconType="dot"
           onClick={[Function]}
           size="xs"
-          type="button"
         >
           <span>
             mutate
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement.test.js.snap
index 59c27fc11fcf5..b7b521c7c387c 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/statement.test.js.snap
@@ -21,10 +21,8 @@ exports[`Statement component renders a CollapsibleStatement with else body for n
         aria-label="else"
         color="text"
         flush="left"
-        iconSide="left"
         onClick={[Function]}
         size="xs"
-        type="button"
       >
         <span
           className="monPipelineViewer__conditional"
@@ -58,10 +56,8 @@ exports[`Statement component renders a CollapsibleStatement with if body for bra
         aria-label="if"
         color="text"
         flush="left"
-        iconSide="left"
         onClick={[Function]}
         size="xs"
-        type="button"
       >
         <span
           className="monPipelineViewer__conditional"
@@ -146,10 +142,8 @@ exports[`Statement component renders spacers for element with depth > 0 1`] = `
         aria-label="else"
         color="text"
         flush="left"
-        iconSide="left"
         onClick={[Function]}
         size="xs"
-        type="button"
       >
         <span
           className="monPipelineViewer__conditional"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__tests__/__snapshots__/collection_enabled.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__tests__/__snapshots__/collection_enabled.test.js.snap
index 6e75c8b77891d..5bbbc9b5df582 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__tests__/__snapshots__/collection_enabled.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_enabled/__tests__/__snapshots__/collection_enabled.test.js.snap
@@ -256,12 +256,9 @@ exports[`ExplainCollectionEnabled should explain about xpack.monitoring.collecti
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <EuiButton
-            color="primary"
             data-test-subj="enableCollectionEnabled"
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
             type="button"
           >
             <button
diff --git a/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap
index 31f58bd46455e..8ae819478a5cb 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap
@@ -434,13 +434,10 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <EuiButton
-            color="primary"
             data-test-subj="enableCollectionInterval"
             fill={true}
-            iconSide="left"
             isLoading={true}
             onClick={[Function]}
-            size="m"
             type="button"
           >
             <button
@@ -749,13 +746,10 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <EuiButton
-            color="primary"
             data-test-subj="enableCollectionInterval"
             fill={true}
-            iconSide="left"
             isLoading={false}
             onClick={[Function]}
-            size="m"
             type="button"
           >
             <button
diff --git a/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
index fb8e92f7e1905..0842406774f73 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
@@ -18,13 +18,13 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           >
             Status
           </p>
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           Status: 
@@ -39,6 +39,11 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
           </span>
            Yellow
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+          Status [object Object]
+        </p>
       </div>
     </div>
     <div
@@ -52,15 +57,20 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           />
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           127.0.0.1:9300
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+           127.0.0.1:9300
+        </p>
       </div>
     </div>
     <div
@@ -74,17 +84,22 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           >
             Documents
           </p>
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           24.8k
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+          Documents 24.8k
+        </p>
       </div>
     </div>
   </div>
@@ -110,17 +125,22 @@ exports[`Summary Status Component should allow status to be optional 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           >
             Free Disk Space
           </p>
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           173.9 GB
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+          Free Disk Space 173.9 GB
+        </p>
       </div>
     </div>
     <div
@@ -134,17 +154,22 @@ exports[`Summary Status Component should allow status to be optional 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           >
             Documents
           </p>
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           24.8k
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+          Documents 24.8k
+        </p>
       </div>
     </div>
   </div>
@@ -169,13 +194,13 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           >
             Status
           </p>
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           Status: 
@@ -190,6 +215,11 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
           </span>
            Green
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+          Status [object Object]
+        </p>
       </div>
     </div>
     <div
@@ -203,17 +233,22 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           >
             Free Disk Space
           </p>
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           173.9 GB
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+          Free Disk Space 173.9 GB
+        </p>
       </div>
     </div>
     <div
@@ -227,17 +262,22 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
           class="euiText euiText--small euiStat__description"
         >
           <p
-            id="generated-id"
+            aria-hidden="true"
           >
             Documents
           </p>
         </div>
         <p
-          aria-labelledby="generated-id"
+          aria-hidden="true"
           class="euiTitle euiTitle--xsmall euiStat__title"
         >
           24.8k
         </p>
+        <p
+          class="euiScreenReaderOnly"
+        >
+          Documents 24.8k
+        </p>
       </div>
     </div>
   </div>
diff --git a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap
index 6542b29ccf3a4..a34d0388a5e3f 100644
--- a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap
+++ b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap
@@ -65,8 +65,6 @@ Array [
       </EuiOverlayMask>
       <EuiFocusTrap
         clickOutsideDisables={true}
-        disabled={false}
-        returnFocus={true}
       >
         <EuiOutsideClickDetector
           isDisabled={false}
@@ -264,10 +262,8 @@ Array [
                       className="euiFlyout__closeButton"
                       color="text"
                       data-test-subj="euiFlyoutCloseButton"
-                      iconSize="m"
                       iconType="cross"
                       onClick={[Function]}
-                      type="button"
                     >
                       <button
                         aria-label="Closes this dialog"
@@ -373,10 +369,8 @@ Array [
       className="euiFlyout__closeButton"
       color="text"
       data-test-subj="euiFlyoutCloseButton"
-      iconSize="m"
       iconType="cross"
       onClick={[Function]}
-      type="button"
     >
       <button
         aria-label="Closes this dialog"
@@ -480,8 +474,6 @@ Array [
       </EuiOverlayMask>
       <EuiFocusTrap
         clickOutsideDisables={true}
-        disabled={false}
-        returnFocus={true}
       >
         <EuiOutsideClickDetector
           isDisabled={false}
@@ -675,10 +667,8 @@ Array [
                       className="euiFlyout__closeButton"
                       color="text"
                       data-test-subj="euiFlyoutCloseButton"
-                      iconSize="m"
                       iconType="cross"
                       onClick={[Function]}
-                      type="button"
                     >
                       <button
                         aria-label="Closes this dialog"
@@ -782,10 +772,8 @@ Array [
       className="euiFlyout__closeButton"
       color="text"
       data-test-subj="euiFlyoutCloseButton"
-      iconSize="m"
       iconType="cross"
       onClick={[Function]}
-      type="button"
     >
       <button
         aria-label="Closes this dialog"
diff --git a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
index 80a471795e360..4e861a5b8d1d5 100644
--- a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
+++ b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
@@ -106,12 +106,6 @@ Array [
                     align="left"
                     data-test-subj="tableHeaderCell_object_title_0"
                     key="_data_h_object_title_0"
-                    mobileOptions={
-                      Object {
-                        "show": true,
-                      }
-                    }
-                    scope="col"
                   >
                     <th
                       className="euiTableHeaderCell"
@@ -134,12 +128,6 @@ Array [
                     align="left"
                     data-test-subj="tableHeaderCell_created_at_1"
                     key="_data_h_created_at_1"
-                    mobileOptions={
-                      Object {
-                        "show": true,
-                      }
-                    }
-                    scope="col"
                   >
                     <th
                       className="euiTableHeaderCell"
@@ -162,12 +150,6 @@ Array [
                     align="left"
                     data-test-subj="tableHeaderCell_status_2"
                     key="_data_h_status_2"
-                    mobileOptions={
-                      Object {
-                        "show": true,
-                      }
-                    }
-                    scope="col"
                   >
                     <th
                       className="euiTableHeaderCell"
@@ -189,12 +171,6 @@ Array [
                   <EuiTableHeaderCell
                     align="right"
                     key="_actions_h_3"
-                    mobileOptions={
-                      Object {
-                        "show": true,
-                      }
-                    }
-                    scope="col"
                   >
                     <th
                       className="euiTableHeaderCell"
@@ -225,12 +201,6 @@ Array [
                       align="center"
                       colSpan={4}
                       isMobileFullWidth={true}
-                      mobileOptions={
-                        Object {
-                          "show": true,
-                        }
-                      }
-                      textOnly={true}
                     >
                       <td
                         className="euiTableRowCell euiTableRowCell--isMobileFullWidth"
@@ -386,12 +356,6 @@ Array [
                   align="left"
                   data-test-subj="tableHeaderCell_object_title_0"
                   key="_data_h_object_title_0"
-                  mobileOptions={
-                    Object {
-                      "show": true,
-                    }
-                  }
-                  scope="col"
                 >
                   <th
                     className="euiTableHeaderCell"
@@ -414,12 +378,6 @@ Array [
                   align="left"
                   data-test-subj="tableHeaderCell_created_at_1"
                   key="_data_h_created_at_1"
-                  mobileOptions={
-                    Object {
-                      "show": true,
-                    }
-                  }
-                  scope="col"
                 >
                   <th
                     className="euiTableHeaderCell"
@@ -442,12 +400,6 @@ Array [
                   align="left"
                   data-test-subj="tableHeaderCell_status_2"
                   key="_data_h_status_2"
-                  mobileOptions={
-                    Object {
-                      "show": true,
-                    }
-                  }
-                  scope="col"
                 >
                   <th
                     className="euiTableHeaderCell"
@@ -469,12 +421,6 @@ Array [
                 <EuiTableHeaderCell
                   align="right"
                   key="_actions_h_3"
-                  mobileOptions={
-                    Object {
-                      "show": true,
-                    }
-                  }
-                  scope="col"
                 >
                   <th
                     className="euiTableHeaderCell"
@@ -505,12 +451,6 @@ Array [
                     align="center"
                     colSpan={4}
                     isMobileFullWidth={true}
-                    mobileOptions={
-                      Object {
-                        "show": true,
-                      }
-                    }
-                    textOnly={true}
                   >
                     <td
                       className="euiTableRowCell euiTableRowCell--isMobileFullWidth"
diff --git a/x-pack/legacy/plugins/security/public/views/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap
index e169c0e68ad9e..ae0648013d2e9 100644
--- a/x-pack/legacy/plugins/security/public/views/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/login/components/basic_login_form/__snapshots__/basic_login_form.test.tsx.snap
@@ -2,11 +2,7 @@
 
 exports[`BasicLoginForm renders as expected 1`] = `
 <Fragment>
-  <EuiPanel
-    grow={true}
-    hasShadow={false}
-    paddingSize="m"
-  >
+  <EuiPanel>
     <form
       onSubmit={[Function]}
     >
@@ -70,10 +66,8 @@ exports[`BasicLoginForm renders as expected 1`] = `
         color="primary"
         data-test-subj="loginSubmit"
         fill={true}
-        iconSide="left"
         isLoading={false}
         onClick={[Function]}
-        size="m"
         type="submit"
       >
         <FormattedMessage
diff --git a/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/__snapshots__/disabled_login_form.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/__snapshots__/disabled_login_form.test.tsx.snap
index 4fb149160472d..3a0fcb1e55507 100644
--- a/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/__snapshots__/disabled_login_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/__snapshots__/disabled_login_form.test.tsx.snap
@@ -1,11 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DisabledLoginForm renders as expected 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiText
     color="danger"
     style={
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap
index b4d2e8418437c..bbbaaafde8654 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap
@@ -1,11 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`it renders without blowing up 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiFlexGroup
     alignItems="baseline"
     gutterSize="s"
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
index 1670a6c39b07d..93f0f8f1e471d 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
@@ -200,13 +200,8 @@ exports[`it renders without crashing 1`] = `
   />
   <EuiHorizontalRule />
   <EuiButton
-    color="primary"
-    fill={false}
-    iconSide="left"
     iconType="plusInCircleFilled"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Add index privilege"
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
index 83f292aa54e96..6f03204b08f3b 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
@@ -134,10 +134,8 @@ exports[`it renders without crashing 1`] = `
         <EuiButtonIcon
           aria-label="Delete index privilege"
           color="danger"
-          iconSize="m"
           iconType="trash"
           onClick={[MockFunction]}
-          type="button"
         />
       </EuiFormRow>
     </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap
index 36a7c69d5b738..b65a181093b54 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/__snapshots__/privilege_space_form.test.tsx.snap
@@ -558,13 +558,10 @@ exports[`<PrivilegeSpaceForm> renders without crashing 1`] = `
           grow={false}
         >
           <EuiButtonEmpty
-            color="primary"
             data-test-subj="cancelSpacePrivilegeButton"
             flush="left"
-            iconSide="left"
             iconType="cross"
             onClick={[Function]}
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Cancel"
@@ -581,10 +578,7 @@ exports[`<PrivilegeSpaceForm> renders without crashing 1`] = `
             data-test-subj="createSpacePrivilegeButton"
             disabled={true}
             fill={true}
-            iconSide="left"
             onClick={[Function]}
-            size="m"
-            type="button"
           >
             <FormattedMessage
               defaultMessage="Update space privilege"
diff --git a/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap
index 1c8eb5834e634..5e3625a1f0fc4 100644
--- a/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap
@@ -14,8 +14,6 @@ exports[`<RolesGridPage /> renders permission denied if required 1`] = `
       >
         <EuiPanel
           className="euiPageContent euiPageContent--horizontalCenter"
-          grow={true}
-          hasShadow={false}
           paddingSize="l"
         >
           <div
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
index 173f7a4e346d5..937ba229b8883 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
@@ -7,10 +7,7 @@ exports[`IndexPatternsMissingPrompt renders correctly against snapshot 1`] = `
       color="primary"
       fill={true}
       href="/test/base/path/app/kibana#/management/kibana/index_patterns"
-      iconSide="left"
-      size="m"
       target="_blank"
-      type="button"
     >
       Configure index patterns
     </EuiButton>
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap
index 3c4a06f2490cc..0698653696059 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap
@@ -112,7 +112,7 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
               "title": "Max Anomaly Score",
             },
             Object {
-              "description": <EuiFlexGroup
+              "description": <ForwardRef
                 direction="column"
                 gutterSize="none"
                 responsive={false}
@@ -134,7 +134,7 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
                     View in Machine Learning
                   </EuiLink>
                 </EuiFlexItem>
-              </EuiFlexGroup>,
+              </ForwardRef>,
               "title": <React.Fragment>
                 <EuiSpacer
                   size="m"
@@ -143,7 +143,7 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
               </React.Fragment>,
             },
             Object {
-              "description": <EuiFlexGroup
+              "description": <ForwardRef
                 direction="column"
                 gutterSize="none"
                 responsive={false}
@@ -168,11 +168,11 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
                     Narrow to this date range
                   </EuiLink>
                 </EuiFlexItem>
-              </EuiFlexGroup>,
+              </ForwardRef>,
               "title": "Detected",
             },
             Object {
-              "description": <EuiFlexGroup
+              "description": <ForwardRef
                 direction="column"
                 gutterSize="none"
                 responsive={false}
@@ -182,11 +182,11 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
                 >
                   process.name: "du"
                 </EuiFlexItem>
-              </EuiFlexGroup>,
+              </ForwardRef>,
               "title": "Anomalous Entity",
             },
             Object {
-              "description": <EuiFlexGroup
+              "description": <ForwardRef
                 direction="column"
                 gutterSize="none"
                 responsive={false}
@@ -206,7 +206,7 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
                 >
                   user.name: "root"
                 </EuiFlexItem>
-              </EuiFlexGroup>,
+              </ForwardRef>,
               "title": "Influenced By",
             },
           ]
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap
index f69e1b9ba5beb..d0926dce55162 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap
@@ -14,14 +14,10 @@ exports[`FilterGroup renders correctly against snapshot 1`] = `
   </EuiText>
   <EuiSpacer />
   <EuiButton
-    color="primary"
-    fill={false}
     href="https://www.elastic.co/subscriptions"
     iconSide="right"
     iconType="popout"
-    size="m"
     target="_blank"
-    type="button"
   >
     Subscription options
   </EuiButton>
diff --git a/x-pack/legacy/plugins/siem/public/components/pin/index.tsx b/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
index d0bbebbf4e7ad..e9a907975a9ea 100644
--- a/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
@@ -41,7 +41,7 @@ export const Pin = pure<Props>(({ allowUnpinning, pinned, onClick = noop }) => (
     onClick={onClick}
     pinned={pinned.toString()}
     role="button"
-    size="l"
+    size="m"
     iconType={getPinIcon(pinned)}
   />
 ));
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
index 35c997ad72071..c04830657a52b 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
@@ -42,11 +42,8 @@ exports[`Stat Items Component disable charts it renders the default widget 1`] =
             className="euiFlexItem sc-bZQynM kpuYFd"
           >
             <EuiPanel
-              grow={true}
-              hasShadow={false}
               onMouseEnter={[Function]}
               onMouseLeave={[Function]}
-              paddingSize="m"
             >
               <div
                 className="euiPanel euiPanel--paddingMedium"
@@ -122,13 +119,11 @@ exports[`Stat Items Component disable charts it renders the default widget 1`] =
                                 >
                                   <EuiButtonIcon
                                     aria-label="Inspect"
-                                    color="primary"
                                     data-test-subj="inspect-icon-button"
                                     iconSize="m"
                                     iconType="inspect"
                                     onClick={[Function]}
                                     title="Inspect"
-                                    type="button"
                                   >
                                     <button
                                       aria-label="Inspect"
@@ -297,11 +292,8 @@ exports[`Stat Items Component disable charts it renders the default widget 2`] =
             className="euiFlexItem sc-bZQynM kpuYFd"
           >
             <EuiPanel
-              grow={true}
-              hasShadow={false}
               onMouseEnter={[Function]}
               onMouseLeave={[Function]}
-              paddingSize="m"
             >
               <div
                 className="euiPanel euiPanel--paddingMedium"
@@ -377,13 +369,11 @@ exports[`Stat Items Component disable charts it renders the default widget 2`] =
                                 >
                                   <EuiButtonIcon
                                     aria-label="Inspect"
-                                    color="primary"
                                     data-test-subj="inspect-icon-button"
                                     iconSize="m"
                                     iconType="inspect"
                                     onClick={[Function]}
                                     title="Inspect"
-                                    type="button"
                                   >
                                     <button
                                       aria-label="Inspect"
@@ -622,11 +612,8 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
           className="euiFlexItem sc-bZQynM kpuYFd"
         >
           <EuiPanel
-            grow={true}
-            hasShadow={false}
             onMouseEnter={[Function]}
             onMouseLeave={[Function]}
-            paddingSize="m"
           >
             <div
               className="euiPanel euiPanel--paddingMedium"
@@ -702,13 +689,11 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                               >
                                 <EuiButtonIcon
                                   aria-label="Inspect"
-                                  color="primary"
                                   data-test-subj="inspect-icon-button"
                                   iconSize="m"
                                   iconType="inspect"
                                   onClick={[Function]}
                                   title="Inspect"
-                                  type="button"
                                 >
                                   <button
                                     aria-label="Inspect"
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/footer/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/footer/__snapshots__/index.test.tsx.snap
index 594f15929b749..9cdbda757d97e 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/footer/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/footer/__snapshots__/index.test.tsx.snap
@@ -33,33 +33,25 @@ exports[`Footer Timeline Component rendering it renders the default timeline foo
               Array [
                 <EuiContextMenuItem
                   icon="empty"
-                  layoutAlign="center"
                   onClick={[Function]}
-                  toolTipPosition="right"
                 >
                   1 rows
                 </EuiContextMenuItem>,
                 <EuiContextMenuItem
                   icon="empty"
-                  layoutAlign="center"
                   onClick={[Function]}
-                  toolTipPosition="right"
                 >
                   5 rows
                 </EuiContextMenuItem>,
                 <EuiContextMenuItem
                   icon="empty"
-                  layoutAlign="center"
                   onClick={[Function]}
-                  toolTipPosition="right"
                 >
                   10 rows
                 </EuiContextMenuItem>,
                 <EuiContextMenuItem
                   icon="empty"
-                  layoutAlign="center"
                   onClick={[Function]}
-                  toolTipPosition="right"
                 >
                   20 rows
                 </EuiContextMenuItem>,
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx
index a8d71e54211e9..104c8c9c03ddf 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx
@@ -100,7 +100,7 @@ interface FooterState {
 export const EventsCount = pure<{
   closePopover: () => void;
   isOpen: boolean;
-  items: React.ReactNode[];
+  items: React.ReactElement[];
   itemsCount: number;
   onClick: () => void;
   serverSideEventCount: number;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
index 46e24042697ef..44fdcbd5e9788 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
@@ -168,7 +168,7 @@ const NotesIcon = pure<{ count: number }>(({ count }) => (
     aria-label={i18n.NOTES}
     color={count > 0 ? 'primary' : 'subdued'}
     data-test-subj="timeline-notes-icon"
-    size="l"
+    size="m"
     iconType="editorComment"
   />
 ));
diff --git a/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
index c323300c6f222..7e3e099bf0276 100644
--- a/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
@@ -36,13 +36,9 @@ exports[`Modal all errors rendering it renders the default all errors modal when
     </EuiModalBody>
     <EuiModalFooter>
       <EuiButton
-        color="primary"
         data-test-subj="modal-all-errors-close"
         fill={true}
-        iconSide="left"
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         Close
       </EuiButton>
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx
index 5ad5cda454998..2524bf7ed4239 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx
@@ -135,7 +135,6 @@ export const RestoreList: React.FunctionComponent = () => {
                 button={
                   <EuiButtonEmpty
                     size="xs"
-                    type="text"
                     iconType="arrowDown"
                     iconSide="right"
                     onClick={() => setIsIntervalMenuOpen(!isIntervalMenuOpen)}
diff --git a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap
index 3edeb75929e4f..ff9861b199e31 100644
--- a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap
@@ -4,12 +4,8 @@ exports[`ManageSpacesButton doesn't render if user profile forbids managing spac
 
 exports[`ManageSpacesButton renders as expected 1`] = `
 <EuiButton
-  color="primary"
-  fill={false}
-  iconSide="left"
   onClick={[Function]}
   size="s"
-  type="button"
 >
   <FormattedMessage
     defaultMessage="Manage spaces"
diff --git a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx b/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
index 5f05bc74ec86e..ef7dba02f8fad 100644
--- a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
@@ -13,7 +13,7 @@ import { MANAGE_SPACES_URL } from '../lib/constants';
 interface Props {
   isDisabled?: boolean;
   className?: string;
-  size?: 's' | 'l';
+  size?: 's' | 'm';
   style?: CSSProperties;
   onClick?: () => void;
 }
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap
index b3a491749f5a4..41efb30ce9753 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap
@@ -89,12 +89,9 @@ exports[`ConfirmDeleteModal renders as expected 1`] = `
     </EuiModalBody>
     <EuiModalFooter>
       <EuiButtonEmpty
-        color="primary"
         data-test-subj="confirmModalCancelButton"
-        iconSide="left"
         isDisabled={false}
         onClick={[MockFunction]}
-        type="button"
       >
         <FormattedMessage
           defaultMessage="Cancel"
@@ -106,11 +103,8 @@ exports[`ConfirmDeleteModal renders as expected 1`] = `
         color="danger"
         data-test-subj="confirmModalConfirmButton"
         fill={true}
-        iconSide="left"
         isLoading={false}
         onClick={[Function]}
-        size="m"
-        type="button"
       >
         <FormattedMessage
           defaultMessage=" Delete space and all contents"
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
index 367568be02a60..26ef77ebf9da9 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
@@ -5,11 +5,7 @@ exports[`DeleteSpacesButton renders as expected 1`] = `
   <EuiButton
     aria-label="Delete this space"
     color="danger"
-    fill={false}
-    iconSide="left"
     onClick={[Function]}
-    size="m"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Delete space"
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
index 6d07edc9bbdb2..6c13259cdde88 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
@@ -1,11 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`it renders without blowing up 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiFlexGroup
     alignItems="baseline"
     gutterSize="s"
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
index cfe14ea07b010..0150b88923d13 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
@@ -39,12 +39,8 @@ exports[`SpacesGridPage renders as expected 1`] = `
         grow={false}
       >
         <EuiButton
-          color="primary"
           fill={true}
-          iconSide="left"
           onClick={[Function]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Create a space"
diff --git a/x-pack/legacy/plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap b/x-pack/legacy/plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap
index 80036c9009302..06becfdda57d0 100644
--- a/x-pack/legacy/plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap
+++ b/x-pack/legacy/plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap
@@ -3,8 +3,6 @@
 exports[`TelemetryForm renders as expected 1`] = `
 <Fragment>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="l"
   >
     <EuiForm>
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap b/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap
index e14826c136f77..425d914c151d5 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/checklist_step.test.tsx.snap
@@ -67,12 +67,9 @@ exports[`ChecklistFlyout renders 1`] = `
         grow={false}
       >
         <EuiButtonEmpty
-          color="primary"
           flush="left"
-          iconSide="left"
           iconType="cross"
           onClick={[MockFunction]}
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Close"
@@ -88,11 +85,8 @@ exports[`ChecklistFlyout renders 1`] = `
           color="primary"
           disabled={false}
           fill={true}
-          iconSide="left"
           isLoading={false}
           onClick={[MockFunction]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Run reindex"
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap b/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap
index cd9ae4f7b6f09..b8402ef5878c4 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap
@@ -119,12 +119,9 @@ exports[`WarningsFlyoutStep renders 1`] = `
         grow={false}
       >
         <EuiButtonEmpty
-          color="primary"
           flush="left"
-          iconSide="left"
           iconType="cross"
           onClick={[MockFunction]}
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Cancel"
@@ -140,10 +137,7 @@ exports[`WarningsFlyoutStep renders 1`] = `
           color="danger"
           disabled={true}
           fill={true}
-          iconSide="left"
           onClick={[MockFunction]}
-          size="m"
-          type="button"
         >
           <FormattedMessage
             defaultMessage="Continue with reindex"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap
index 0a5df633fa588..e18846e960122 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/empty_status_bar.test.tsx.snap
@@ -1,11 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EmptyStatusBar component renders a default message when no message provided 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiFlexGroup
     gutterSize="l"
   >
@@ -19,11 +15,7 @@ exports[`EmptyStatusBar component renders a default message when no message prov
 `;
 
 exports[`EmptyStatusBar component renders a message when provided 1`] = `
-<EuiPanel
-  grow={true}
-  hasShadow={false}
-  paddingSize="m"
->
+<EuiPanel>
   <EuiFlexGroup
     gutterSize="l"
   >
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/error_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/error_list.test.tsx.snap
index 8f12979249a02..b5c6b4184cdd3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/error_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/error_list.test.tsx.snap
@@ -14,8 +14,6 @@ exports[`ErrorList component renders the error list without errors 1`] = `
     </h5>
   </EuiTitle>
   <EuiPanel
-    grow={true}
-    hasShadow={false}
     paddingSize="s"
   >
     <EuiInMemoryTable
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap
index e98410820db35..1951f2164fcac 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap
@@ -2,11 +2,7 @@
 
 exports[`PingList component renders sorted list without errors 1`] = `
 <Fragment>
-  <EuiPanel
-    grow={true}
-    hasShadow={false}
-    paddingSize="m"
-  >
+  <EuiPanel>
     <EuiTitle
       size="xs"
     >
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap
index 416f2ab4e21d6..248f88ae8c893 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap
@@ -2,11 +2,7 @@
 
 exports[`Snapshot component renders without errors 1`] = `
 <Fragment>
-  <EuiPanel
-    grow={true}
-    hasShadow={false}
-    paddingSize="m"
-  >
+  <EuiPanel>
     <EuiTitle
       size="xs"
     >
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap
index c48d15820423b..30b2e7204e404 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/data_missing.test.tsx.snap
@@ -10,11 +10,7 @@ exports[`DataMissing component renders basePath and headingMessage 1`] = `
     <EuiSpacer
       size="xs"
     />
-    <EuiPanel
-      grow={true}
-      hasShadow={false}
-      paddingSize="m"
-    >
+    <EuiPanel>
       <EuiEmptyPrompt
         body={
           <p>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index a78f45310b723..68c216277d3d3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -140,11 +140,7 @@ exports[`EmptyState component does not render empty state with appropriate base
                 className="euiSpacer euiSpacer--xs"
               />
             </EuiSpacer>
-            <EuiPanel
-              grow={true}
-              hasShadow={false}
-              paddingSize="m"
-            >
+            <EuiPanel>
               <div
                 className="euiPanel euiPanel--paddingMedium"
               >
@@ -616,11 +612,7 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
                 className="euiSpacer euiSpacer--xs"
               />
             </EuiSpacer>
-            <EuiPanel
-              grow={true}
-              hasShadow={false}
-              paddingSize="m"
-            >
+            <EuiPanel>
               <div
                 className="euiPanel euiPanel--paddingMedium"
               >
@@ -935,11 +927,7 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
       ]
     }
   >
-    <EuiPanel
-      grow={true}
-      hasShadow={false}
-      paddingSize="m"
-    >
+    <EuiPanel>
       <div
         className="euiPanel euiPanel--paddingMedium"
       >
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/condensed_check_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/condensed_check_list.test.tsx.snap
index 2132190565f84..58b0887c29b32 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/condensed_check_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/condensed_check_list.test.tsx.snap
@@ -30,7 +30,7 @@ exports[`CondensedCheckList component renders checks 1`] = `
     <EuiToolTip
       content={
         Array [
-          <EuiFlexGroup>
+          <ForwardRef>
             <EuiFlexItem>
               <EuiHealth
                 color="danger"
@@ -42,8 +42,8 @@ exports[`CondensedCheckList component renders checks 1`] = `
             <EuiFlexItem>
               a few moments ago
             </EuiFlexItem>
-          </EuiFlexGroup>,
-          <EuiFlexGroup>
+          </ForwardRef>,
+          <ForwardRef>
             <EuiFlexItem>
               <EuiHealth
                 color="primary"
@@ -55,7 +55,7 @@ exports[`CondensedCheckList component renders checks 1`] = `
             <EuiFlexItem>
               a few moments ago
             </EuiFlexItem>
-          </EuiFlexGroup>,
+          </ForwardRef>,
         ]
       }
       delay="regular"
@@ -90,7 +90,7 @@ exports[`CondensedCheckList component renders checks 1`] = `
     <EuiToolTip
       content={
         Array [
-          <EuiFlexGroup>
+          <ForwardRef>
             <EuiFlexItem>
               <EuiHealth
                 color="danger"
@@ -102,8 +102,8 @@ exports[`CondensedCheckList component renders checks 1`] = `
             <EuiFlexItem>
               a few moments ago
             </EuiFlexItem>
-          </EuiFlexGroup>,
-          <EuiFlexGroup>
+          </ForwardRef>,
+          <ForwardRef>
             <EuiFlexItem>
               <EuiHealth
                 color="danger"
@@ -115,7 +115,7 @@ exports[`CondensedCheckList component renders checks 1`] = `
             <EuiFlexItem>
               a few moments ago
             </EuiFlexItem>
-          </EuiFlexGroup>,
+          </ForwardRef>,
         ]
       }
       delay="regular"
@@ -163,7 +163,7 @@ exports[`CondensedCheckList component renders null in place of child status with
       content={
         Array [
           null,
-          <EuiFlexGroup>
+          <ForwardRef>
             <EuiFlexItem>
               <EuiHealth
                 color="primary"
@@ -175,7 +175,7 @@ exports[`CondensedCheckList component renders null in place of child status with
             <EuiFlexItem>
               a few moments ago
             </EuiFlexItem>
-          </EuiFlexGroup>,
+          </ForwardRef>,
         ]
       }
       delay="regular"
@@ -210,7 +210,7 @@ exports[`CondensedCheckList component renders null in place of child status with
     <EuiToolTip
       content={
         Array [
-          <EuiFlexGroup>
+          <ForwardRef>
             <EuiFlexItem>
               <EuiHealth
                 color="danger"
@@ -222,8 +222,8 @@ exports[`CondensedCheckList component renders null in place of child status with
             <EuiFlexItem>
               a few moments ago
             </EuiFlexItem>
-          </EuiFlexGroup>,
-          <EuiFlexGroup>
+          </ForwardRef>,
+          <ForwardRef>
             <EuiFlexItem>
               <EuiHealth
                 color="danger"
@@ -235,7 +235,7 @@ exports[`CondensedCheckList component renders null in place of child status with
             <EuiFlexItem>
               a few moments ago
             </EuiFlexItem>
-          </EuiFlexGroup>,
+          </ForwardRef>,
         ]
       }
       delay="regular"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index 78d1887e669b5..944ce4843b6ad 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -2,11 +2,7 @@
 
 exports[`MonitorList component renders a no items message when no data is provided 1`] = `
 <Fragment>
-  <EuiPanel
-    grow={true}
-    hasShadow={false}
-    paddingSize="m"
-  >
+  <EuiPanel>
     <EuiTitle
       size="xs"
     >
@@ -89,11 +85,7 @@ exports[`MonitorList component renders a no items message when no data is provid
 
 exports[`MonitorList component renders the monitor list 1`] = `
 <Fragment>
-  <EuiPanel
-    grow={true}
-    hasShadow={false}
-    paddingSize="m"
-  >
+  <EuiPanel>
     <EuiTitle
       size="xs"
     >
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/__tests__/__snapshots__/kibana_global_help.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/__tests__/__snapshots__/kibana_global_help.test.tsx.snap
index f79cc58566e75..9ae847cfc7fb9 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/__tests__/__snapshots__/kibana_global_help.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/__tests__/__snapshots__/kibana_global_help.test.tsx.snap
@@ -14,14 +14,10 @@ exports[`renderUptimeKibanaGlobalHelp renders links with expected urls 1`] = `
   <EuiSpacer />
   <EuiButton
     aria-label="Go to Uptime documentation"
-    color="primary"
     fill={true}
     href="https://elastic.co/guide/en/kibana/master/xpack-uptime.html"
-    iconSide="left"
     iconType="popout"
-    size="m"
     target="_blank"
-    type="button"
   >
     <FormattedMessage
       defaultMessage="Uptime documentation"
diff --git a/x-pack/package.json b/x-pack/package.json
index ea76a7c475390..c389d820a6cf6 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -184,7 +184,7 @@
     "@babel/runtime": "^7.5.5",
     "@elastic/ctags-langserver": "^0.1.9",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "13.6.1",
+    "@elastic/eui": "13.8.1",
     "@elastic/javascript-typescript-langserver": "^0.2.2",
     "@elastic/lsp-extension": "^0.1.2",
     "@elastic/maki": "6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 260407af38f91..7c10db0405d6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -983,10 +983,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@13.6.1":
-  version "13.6.1"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-13.6.1.tgz#4bcef855c9e5bb368436e18d79443b2f1fbeffef"
-  integrity sha512-i2f9J+Cf8/2fydIAT8MapvAtP//XZxybH0cU3UYASvc5P8DBt6rU/jdWLcHJhTHYZFDP+PjMMGzxWQNUS40IGg==
+"@elastic/eui@13.8.1":
+  version "13.8.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-13.8.1.tgz#17bc50c634145a242be9fd4cdc78b857eadf60f3"
+  integrity sha512-4GbNpN3SIOFYviE2cfqIMCUmMf2KNSwEdMHP7cMwwa4u/W708NKOLB52Ipn0raWnWHAuIu9k5v9CrbaZfd1gdA==
   dependencies:
     "@types/lodash" "^4.14.116"
     "@types/numeral" "^0.0.25"